added testfile.html to first_branch
added badtouch.html
Merge branch 'master' of https://github.com/nickpassarella/problem_tickets
Merging from upstream master
Delete testfile.html
Delete badtouch.html
Merge branch 'master' of https://github.com/nickpassarella/problem_tickets
Merging Nick's updates from upstream branch
added gems did_you_mean, foundation-rails, simple_form, font-awesome-rails, rails_12factor
additional updates to gemfile, added some welcome copy to the problems index (aka root) page
made updates to root page copy; added gems quiet_assets and spring
set up placeholder topnav partial
added login form
added new user registration form
modified nav bar links and added new problem form
added form for new note to problems show page
Merge pull request #3 from gregurton/master

11pm friday pull request