Added montania as user
Merge branch 'master' of https://github.com/montania/website into montania-master

Conflicts:
	data/users.yml