asd
sdf
Merge branch 'master' of https://github.com/andrewwu-mt/spinach.git

Conflicts:
	WebRoot/WEB-INF/jsp/index.jsp
	WebRoot/js/main.js