initial
mysql version
Merge branch 'master' of github.com:Logic-Seeker/database_test

Conflicts:
	.Gemfile.swp
	Gemfile
conflict