added a mertic fuckton of comments
Merge branch 'master' of https://github.com/justinmurphy92/TZ
added a imperial shitton of comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	profile.php