best commit
Merge branch 'master' of https://github.com/jaredborner/lacc

Conflicts:
	public/admin.html