commit
Merge branch 'master' of https://github.com/b4um1/Microproject_Notes.git

Conflicts:
	Microproject_Nots/src/at/fh/ooe/mc/android/MainActivity.java