init.
padrino init.
padrino configured.
public folder reorganized
bootstrapped
no bootstrap
Merge branch 'master' of github.com:icco/sadnat.com

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.md
	Rakefile
	config.ru
moving stuff around.
moving stuff
mergity
eh
switch to AR migrations
Merge branch 'master' of github.com:icco/sadnat.com

Conflicts:
	Gemfile
	Gemfile.lock