New options

UNDONE LINKS
THE link is incomplete pls add
the name can be changed if u like pls dun change
Merge remote-tracking branch 'origin/master'

Conflicts:
	SP1Framework/game.cpp