having two copies of the bootstrap files is confusing and causes problems
Merge remote branch 'origin/master'