working pic and login
Merge branch 'master' of github.com:jameijsden/M7011E2014

Conflicts:
	_index.html