Added routes for users and activities & Added the templates folder in app/assets/javascripts/
Merge branch 'master' of https://github.com/Jon1213/activity_app
Added app/controllers/activities_controller.rb & app/views/activities/new.html.erb
Merge pull request #5 from jangelroa/master

activities_controller
got rid of the .coffee
generated controllers and templates. Put your code where it should go if it isnt there already
small css changes
also moved the function call from home controller to activities controller
pondering
Added suggestion form and upload image feature
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from jangelroa/master

Added suggestion form and upload image feature
start of carousel css changes
moved google font link to application.css