hope that wasn't disastrous
Merge branch 'master' of https://github.com/gopher-snakes-2014/flash-yourself
yay!
Conflicts:
	app/controllers/index.rb
whatever...