templates
Merge branch 'dev' of github.com-dschonfe:heartbit/hackathon into dev
tips on items