latest
Merge branch 'master' of https://github.com/afewyards/projecttouch

Conflicts:
	app/filters.js
	app/project-touch.js
	index.html
Merge pull request #2 from zonakusu/master

latest