Resolve dependencies
Merge branch 'master' of github.com:dmastylo/Convert_To_Bootstrap_3

Conflicts:
	README.md