Networkin and stuff
Merge branch 'master' of https://github.com/peruginim/ProjectAtom

Fixing conflicts. Made backup p.atoms folder

Conflicts:
	Atoms/bin/Atoms.apk
	Atoms/bin/classes.dex
	Atoms/bin/classes/cs252/lab6/atoms/Player.class
	Atoms/bin/classes/cs252/lab6/atoms/Settings.class
	Atoms/bin/resources.ap_