First Rails.
Merge branch 'master' of github.com:andrewhao/hendrix-api

Conflicts:
	.gitignore