WIP on master: abeab28 worked on controller to bring up postCreateTime()
Merge commit 'stash'
bring up of pivot tables and other stuff
Merge pull request #20 from b-dub25/master

tables
WIP on master: c4edc62 updating course related
Merge commit 'stash'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/layouts/layout.php
inventory_changes
inventory changes
inventory changes
inventory changed
Merge pull request #22 from mhender24/master

inventory
update - auto assign labaides
index on master: a476dd5 update - auto assign labaides
WIP on master: a476dd5 update - auto assign labaides
Merge remote-tracking branch 'upstream/master'
updating again
index on master: 0559059 inventory changed
WIP on master: 0559059 inventory changed
merge