My Changes
s
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/js/app.js
	app/build/styles/app.css
	app/jade/page1.html
	app/jade/page1.jade
	app/styles/app.css
	app/styles/app.styl
	gulpfile.js
	index.js
	package.json
gulpfile