Merge remote-tracking branch 'origin/master'

Conflicts:
	index2.html

testing
Merge branch 'master' of https://github.com/oakleyroflmao/oakleyroflmao.github.io