Updated broken page :(
Merge branch 'master' of https://github.com/orangedog22/cgt456-final

Conflicts:
	dropbox/requests/authorize.php
Merge branch 'master' of https://github.com/orangedog22/cgt456-final