Local Commit BB
Merge branch 'master' of
https://github.com/dpridgen/de.vogella.git.first.git

Conflicts:
	de.vogella.git.first/src/de/vogella/git/first/NewExampleClass.java