first commit
Merge branch 'master' of github.com:tsabat/dees_rails

Conflicts:
	.gitignore