First commit
Merge branch 'master' of https://github.com/Flynn53/Website

Conflicts:
	index.html

I have no idea
Merge branch 'master' of https://github.com/Flynn53/Website

Conflicts:
	index.html