Merge pull request #1 from bamiano/master

testing GIT #2
Merge pull request #2 from bamiano/master

routes and models
slight update
merge conflict
Merge pull request #3 from bamiano/master

tinkered with models and added users controller
changes for signup and login
merge conflict resolved night Dec 14
fixed models and associations