Initial Commit
Merge branch 'master' of github.com:AdamKyle/Rails-Dev-Box

Conflicts:
	README.md