Merge pull request #12 from kevincol54/master

hopefully these changes work
Merge pull request #13 from kevincol54/master

controllers, models, views and migrations should all be working with the...
Merge pull request #14 from kevincol54/master

Code looks good to me.
added css files and minor revisions to view files
Merge pull request #15 from Brian-Boyd/master

looks good as far as i can tell.
fixed merge conflicts