testing git
Merge branch 'master' into Dev

Conflicts:
	Note.java
what
Merge branch 'Dev'

Conflicts:
	Note.java