new stuff

added all new files
Merge branch 'master' of https://github.com/joelconrad/inventory

Conflicts:
	content/css/bootstrap.min.css
	index.html