new commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/scripts/constructors.js
minor changes
another commit
minor tweaks
Merge pull request #11 from eastcoastsb/master

minor tweaks
this should work