save before pulling
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	config/routes.rb
	log/development.log
commit before pull
Merge pull request #24 from dylanerichards/master

.