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

Conflicts:
	loops.java