ASL files
Merge branch 'master' of https://github.com/romanzubenko/YHack

Conflicts:
	app/app.js
	public/styles/styles.css