adding in gulp (working)
tweak gulp setup
Merge branch 'gulp'
not sure what is going on
still not sure what's going on
test commit
dist/main.js commit

need to remove dist from commits…
Merge branch 'firebase'

Conflicts:
	index.html
	js/main.js