server git startup
Merge branch 'master' of github.com:asucrews/uims

Conflicts:
	img/aab3238922bcc25a6f606eb525ffdc56.jpg
	img/ca38d904174f8d6acc6103ff6c852c58.jpg
	img/collapsed.png
	img/jrMjsjm.jpg
	index.php
	main.php
	users.php