Initial Add
Merge branch 'master' of http://github.com/hamiltondanielb/RubyRailsApp

Conflicts:
	.gitignore