Merge branch 'one-page'
Try fixing zoom on ios
Merge branch 'develop'
thicker default font
Wider content area
Again, wider main content
Remove borders and increase font size of p
Add codekit project
Update gitignore
Add compass project
Testing push
Revert "Testing push"

This reverts commit 6e7d646df3f030e895ed7d3a0d7efcc33ad5ada4.
Renconfigure codekit to use styles dir
Change to Sofia Pro
Style the fonts correctly!
Merge branch 'font-test'

Conflicts:
	sass/screen.scss
	styles/screen.css
Update codekit for js
Remove Sofia
Add typekit code back in
Merge branch 'font-test' into develop