MH- adding stuff
Merge branch 'master' of https://github.com/sos12/Love-Note

Conflicts:
	Shield/Shield Theme/index.html