init
Merge branch 'master' of github.com:ujjwalt/ribs

Conflicts:
	.gitignore