running server implementation
Merge branch 'ServerPrototype'

Conflicts:
	CrowdMusic/src/main/java/com/hdm/crowdmusic/activities/MainActivity.java
Modified build stuff
added .travis.yml
Create README.md
fixed permissions
manually merged
modified travis config
modified travis.yml... again
travis.yml
travis.yml... god dammit
and again
son of a...
travis
added Buildstatus display to readme
merged branch master