Merge pull request #1 from namzo/beta

Beta
Merge branch 'beta'
Merge branch 'master' of https://github.com/namzo/namzo.github.com
Merge branch 'beta'
CK
Merge branch 'beta'

Conflicts:
	config.codekit
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'
Merge branch 'beta'

Conflicts:
	config.codekit
	css/style.css
	index.html
Merged conflict
Merge branch 'beta'
Merge branch 'beta'
About page