Test 2
Resolve file deletion conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	DropNotes/._AppDelegate.m
Merge branch 'master' of https://github.com/francisypl/dropnotes