Stuff
Merge branch 'master' of https://github.com/TechTrinkets/techtrinkets

Conflicts:
	build/web/register.jsp
	web/register.jsp