beginning of layout
bootstrap added
Catching up changes made in wtf branch after this was created
Merge branch 'wtf' into bootstrap
Adding jquery
untemplating
more untemplating