update me
Merge branch 'master' of https://github.com/jaredhalpert/hacks

Conflicts:
	me/app.js