I dont wanna do this comit
Merge branch 'master' of https://github.com/danw13335/lannister-final-project-website

Conflicts:
	templates/index.tpl
Do not commit
Merge branch 'master' of https://github.com/danw13335/lannister-final-project-website