angie settings fork
Merge branch 'master' of https://github.com/angieskazka/spaceshaker

Conflicts:
	3dtouch.html
	js/User.js