Adding second Kata to repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	src/main/java/edu/pdx/cs410J/tfetters/fizzBuzz.java
Adding second Kata to repo