updates
Merge branch 'master' of github.com:brownrl/skeleton

* 'master' of github.com:brownrl/skeleton:
  handy for show an image or not
  bringing in the classes.

Conflicts:
	admin/inc.php