change
stuff
Merge branch 'master' of heroku.com:virtualcouch

Conflicts:
	.DS_Store