Added an options page named Settings.
Merge branch 'master' of https://github.com/peruginim/ProjectAtom

Trying to fix conflicts.

Conflicts:
	Atoms/bin/Atoms.apk
	Atoms/bin/classes.dex
	Atoms/bin/classes/cs252/lab6/atoms/GameSurface.class
	Atoms/bin/classes/cs252/lab6/atoms/Menu.class
	Atoms/bin/classes/cs252/lab6/atoms/R$id.class
	Atoms/bin/classes/cs252/lab6/atoms/R$layout.class
	Atoms/bin/classes/cs252/lab6/atoms/R$string.class
	Atoms/bin/classes/cs252/lab6/atoms/R$style.class
	Atoms/bin/classes/cs252/lab6/atoms/R$styleable.class
	Atoms/bin/resources.ap_
	Atoms/gen/cs252/lab6/atoms/R.java
I think I fixed the massive amounts of conflicts, now this version should
have the updated optuions menu included. However the app crashes when trying
to open it because I had no idea how Niraj implemented page switching. I
want to let him do that.