fixed unresolved merge conflict
adds compass modules
Merge branch 'master' into responsive-ui-updates
Adds static foundation
Adds css and js files
cleans up index and adds form styles
merges files
Merges all the things