pull request
Merge branch 'master' of https://github.com/devWayne/CampusWeb

Conflicts:
	README.md

Signed-off-by: devWayne <dev.wayne.ix@gmail.com>