mode mortor more specific
Merge branch 'master' of github.com:strangemask/newGitTest

Conflicts:
	index.html
because i thought it was really important
necessary really