Merge attempt

First try at merging local files.
Welcome conflict
Merge branch 'deployment' of https://github.com/Helorank/Helorank into deployment

Conflicts:
	templates/index/welcome.html