Message should not show every time, quick fix for that
Ignored cloud9 stuff
Merge branch 'master' into user_accounts

Conflicts:
	.gitignore