base app
Merge branch 'master' of https://github.com/steveyang95/proj2

Conflicts:
	README.md