Merge pull request #2 from jjordan9/master

Merge jeff's files
Merge pull request #3 from jjordan9/master

bs
challenge 1
Merge branch 'master' of github.com:kenleezle/magcoder

Conflicts:
	loops.java
Merge pull request #2 from kenleezle/master

challenge