Fixing sqlite 3 problem
Merge branch 'master' of heroku.com:korcgames

Conflicts:
	Gemfile
	Gemfile.lock
Merge completion
merge complete
This has to run on site
This has to run on site
Take it to the mac