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

Conflicts:
	nbproject/private/private.properties