added my name
Merge branch 'master' of https://github.com/menglert11487/Campus-Viewer

Conflicts:
	README.md