Delete .classpath
Delete .project
Merge remote-tracking branch 'origin/master'

Conflicts:
	Musical-fingers/.classpath

Signed-off-by: Maciej <maciek93@gmail.com>