Migrated code from heroku
Merge branch 'master' of github.com:rcdexta/aramseyvirumbu

Conflicts:
	.gitignore