first commit
Merge branch 'master' of github.com:ctremonte/ri-demo

Conflicts:
	.gitignore