change welcome
Merge branch 'master' of heroku.com:young-atoll-2095
change welcome
Merge branch 'master' of heroku.com:young-atoll-2095

Conflicts:
	index.php
emoticons
welcome