tweaks
Merge branch 'master' of https://github.com/michaelodriscoll/CompWS
tweaks, new grid system, better naming
style tweaks