initial commit
config deploy
Automated commit at 2013-01-08 16:57:49 UTC by middleman-deploy 3.0.7
volo javascript clena up sas convert merge with proto
clean up javascript + favicon
modrnizr
index e bestiarum
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config.rb
	source/favicon_base.png