fixed merge conflicts in admin theme
Converted bootstrap into a populate task
Removed faulty migration
Adds readme to repo
Merge pull request #345 from MGhanem/fix_master

Fix master