Some messing around...
Merge branch 'master' of https://github.com/mkulumadzi/SnailMail

Conflicts:
	.DS_Store
	app.rb