Nice Commit (5/9)
Nice Commit~~!!!(5/9)
Merge branch 'master' of https://github.com/pukekaka/CashewNut_Temp

Conflicts:
	.gitignore
	src/main/java/com/asecreponse/cashewnuttp/HomeController.java