Initial commit
Created Android Studio project.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	edrum.iml
Set Android SDK version to 21.