Swapped out bootstrap theme, added basic content.
Fixed merge conflict