getting the code
merging
getting latest
accepting merge
Merge branch 'master' into twobirds-jw1
getting latest
get latest
Bundled css and js files; made changes to layout
Merge pull request #6 from kneekey23/twobirds-jw1

Bundled css and javascript, made changes to layout