fix grunt build
Merge pull request #33 from ninjascience/grunt_fix

fix grunt build
updated layout based on wireframe
Merge pull request #35 from ninjascience/layout

updated layout based on wireframe