changes
Merge branch 'master' of https://github.com/unfortunatetoast/myphpbase

Conflicts:
	global/js/index.js