Merge pull request #36 from slwaller/master

fix merge
Merge pull request #37 from slwaller/master

added user authentication
removed turbolinks
Merge pull request #38 from belindahare/master

removed turbolinks