asdasdadasdasdasd
Merge branch 'master' of https://github.com/samjhill/rit48

Conflicts:
	trending.html
Merge branch 'master' of https://github.com/samjhill/rit48

Conflicts:
	assets/php/welcome.php