add main lock/unlock flow
Merge branch 'master' of https://github.com/skylerberg/atthack

Conflicts:
	index.html