merge fix
Merge branch 'master' of
https://github.com/intern-sam/AndroidNoteProject.git

Conflicts:
	Note/src/com/practice/note/MainActivity.java
	Note/src/com/practice/note/NewNoteActivity.java
	Note/src/com/practice/note/NoteTitleFragment.java