+ add
+ dev
+ add master
Merge branch 'dev'

Conflicts:
	app.js