initial commit
index e bestiarum
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config.rb
	source/favicon_base.png
Merge remote-tracking branch 'arcadiaproject_pier/master'
merge