Added first feature
Added Second feature
Corrected format.
Merge branch 'feature2'

Conflicts:
	busime_ues/src/com/git/test/buchbum.java
Merge remote-tracking branch 'origin/master'