made awesome() method
put sout int awesome()
put comment in awesome()
put another comment in masterbranch1()
Merge branch 'testBranch1'

Conflicts:
	src/CleverClassName.java