Committing changes

Commit!
Merge branch 'master' of https://github.com/calwater/test

Conflicts:
	alert.js

Merging...