important stuff
Merge branch 'master' of https://github.com/michaelrbock/CheetSheet

Conflicts:
	api/login.php