initial commit
Merge branch 'master' of github.com:00promise/00promise_rails

Conflicts:
	.gitignore