mail
Merge branch 'master' of https://github.com/riichb/StockIN

Conflicts:
	config/routes.rb