more commits
Merge branch 'Original' of
https://github.com/rchawla8/AndroidDesignProject into Original

Conflicts:
	M2/M2/src/Untitled 1