index on master: abeab28 worked on controller to bring up postCreateTime()
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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/layouts/layout.php
inventory_changes
inventory changes
inventory changes
inventory changed
index on master: 0559059 inventory changed
WIP on master: 0559059 inventory changed
merge
merge stash
Merge pull request #1 from Mallics/master

To put project on dev
updates to inventory/controllers
fixes to inventory
inventory adds/fixes
inventory adds/fixes
inventory adds/fixes