Initial Project Commit
Merge branch 'master' of git+ssh://github.com/MarkAufdencamp/htp-rails-3

Conflicts:
	.gitignore