FINAL CRUD WITH BASIC BOOTSTRAP
cleared up the merge errors between Mike's and the current version
Merge branch 'mwdion-master'