k
Merge branch 'master' of https://github.com/globmont/Bitcamp

Conflicts:
	Desktop/SMS/.classpath