Merge pull request #4 from jangelroa/master

Remove files that ought not to be tracked
working with seeds
Added routes for users and activities & Added the templates folder in app/assets/javascripts/
Removed the files... again?
creating activity seeds
Merge branch 'master' of https://github.com/Jon1213/activity_app
Added img_url to activities, because I forgot
Merge branch 'master' of https://github.com/Jon1213/activity_app
Added app/controllers/activities_controller.rb & app/views/activities/new.html.erb