Merge pull request #6 from kneekey23/twobirds-jw1

Bundled css and javascript, made changes to layout
more bundling and layout changes
Merge branch 'master' into twobirds-jw1