just cause git is annouyoing
idc
Merge branch 'master' of https://github.com/Gregs-List/Chronos

Conflicts:
	User_Photos/4.jpg
	viewFullListingJSON.php
Merge branch 'master' of https://github.com/Gregs-List/Chronos
Merge branch 'master' of https://github.com/Gregs-List/Chronos
smoothed out slide show