Merge branch 'master' of https://github.com/liamfd/fitkids

Conflicts: .gitignore
liamfd · Mar 21, 2014 · 5fb9243 · 5fb9243
2 parents c66a026 + 813f033
commit 5fb9243
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-ra-*.html
+*.rbc
+capybara-*.html
 .rspec
 /log
 /tmp

diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+fitkids
+=======
+
+Final Project for Web Development Class: App to allow children to track their fitness.