Initial comit
Merge branch 'master' of github.com:soichih/gratiana

Conflicts:
	.gitignore