test
Merge branch 'master' of https://github.com/jonamkwon/sprest.git

Conflicts:
	src/main/java/com/wmp/sprest/HomeController.java