Merge pull request #1 from cmhedrick/master

Updates for some basic functions
Merge pull request #2 from cmhedrick/master

modified items table to new standards
Added CSS to base.tpl
Merge branch 'master' of https://github.com/ahirschberg/check_it_out

Conflicts:
	run.py