* Removed master Bootstrap template repository (files are in master repo)
* Updated README.md | * Fixed conflicts