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
New CSS. New welcome page
Fully integrated welcome page
Reset settings.py file
Hi Kyle
Merge commit '9049872344c9a7972f136f47c5762451a91405c5' into kyle-accounts
Adding accounts integrated with fronted