grunt-ts
Merge branch 'master' of https://github.com/funnythingz/qflipper

Conflicts:
	qflipper.min.js