starting to style homepage
fixed merge conflict
Merge branch 'master' of https://github.com/jmiramant/political_kickstarter
update to couple files
updated global.css.sass (font-family not just font)