multiple changes... oops
Merge branch 'master' of https://github.com/Rabmuk/Teem

Conflicts:
	public/bottomNav.php
	public/headerNav.php

I really hope nothing is broken...
Merge branch 'master' of https://github.com/Rabmuk/Teem

Conflicts:
	public/bottomNav.php
	public/createaccount.php
	public/profile.php

D: ...
Merge branch 'master' of https://github.com/Rabmuk/Teem