color edits
Merge branch 'master' of https://github.com/Gbear605/uPic_client

Conflicts:
	index.html
Merge branch 'master' of https://github.com/Gbear605/uPic_client