fixed merge conflicts
Merge pull request #7 from mwdion/master

FINAL CRUD WITH BASIC BOOTSTRAP
fixed conflict merge