complete 1.0
Merge branch 'master' of https://github.com/moonlighthouse/moonlighthouse.github.com

Conflicts:
	index.html