first stash
Merge branch 'master' of github.com:dangwalsh/AppComp

Conflicts:
	js/insert.js
nineteenth commit