heroku stuff
heroku
heroku2
assets compiled for Heroku
assets compiled for Heroku2
updated ruby and rails and gems and ready to deploy
Merge branch 'master' of https://github.com/Shidash/Transparency-Toolkit

Conflicts:
	Gemfile.lock
	app/views/form_handlers/toolinput.html.erb