brought from target
Def Merge https://github.com/NickNack25/starter-kit

Conflicts:
	web/controller/page3.js

ops spaghettio
oink
~
~