Initial commit
Merge branch 'master' of github.com:premedios/Mailr

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/application.rb
	config/initializers/secret_token.rb
Removed test folder to favor respec