Merge pull request #13 from mechanical2000/dev

Dev
Add game type to the application #14
Merge branch 'dev' into add_type_games_#14

Conflicts:
	db/schema.rb
Merge branch 'add_type_games_#14' into dev
Fix merge with #14
Merge branch 'dev' of https://github.com/mechanical2000/MMLB into dev