abcd
Merge branch 'master' of https://github.com/AngelHack14/SnipNote.git
Merge branch 'master' of https://github.com/AngelHack14/SnipNote.git

Conflicts:
	SnipNote2/src/com/example/snipnote2/MainActivity.java