starting to construct row, after this complete table
TODO: make company a dropdown, and hook changes to model.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js
starting to construct row, after this complete table
TODO: make company a dropdown, and hook changes to model.