Useless change.= =
Merge branch 'master' of https://github.com/iphkwan/SYSUStreetView

Conflicts:
	view.cpp