padrino g project -l -a postgres -d activerecord -t minitest -s jquery -e erb -c scss seihei
Merge branch 'master' of github.com:icco/seihei

Conflicts:
	.gitignore
log