Merge branch 'master' of https://github.com/spacedaniel22/Project--The-Dan-Side--One

Conflicts:
	Dan'Side/index.html
Index