Merge branch 'master' into associations
more notes
Merge pull request #11 from arieldiamond/basic_views

Basic views
travis.yml
Merge branch 'master' into travis
travis working
Merge pull request #12 from arieldiamond/travis

Travis
Update README.md
Update README.md
coveralls
coveralls
Merge pull request #13 from arieldiamond/travis

Travis
Add 2nd check-in notes
adding additional fields to user sign_up
user sign up now includes additional parameters
Update README.md
working on editing user functionality
Merge branch 'master' into basic_views