This is my first Git commit
Merge branch 'master' of https://github.com/Madprankster/madprankster.github.io

Conflicts:
	index.html