removed un-needed CSS
changes to master
bootstrap working
merged master with bootstrap fix