add bootstrap and navbar
merge conflict
Merge pull request #1 from Shuffguy/boostrap

Boostrap