updated database.yml'
Merge branch 'master' of https://github.com/achappell/itrackgames
Merge branch 'master' of https://github.com/achappell/itrackgames
Merge branch 'master' of https://github.com/achappell/itrackgames
Merge branch 'master' of https://github.com/achappell/itrackgames
Merge branch 'master' of https://github.com/achappell/itrackgames

Conflicts:
	Gemfile.lock