Merge pull request #54 from milanocookies93/master

2014 Seniors
Merge pull request #55 from milanocookies93/master

Update host repo
Added new puzzles, some cosmetic changes to old ones

Added puzzles for NOT, AND, OR in conditionals, as well as nested if's
and controlling while loops with for loops.
Merge branch 'master' of https://github.com/themasterofrobots/javaplayland
Added one more puzzle; for loops
Added new puzzles, some cosmetic changes to old ones

Added puzzles for NOT, AND, OR in conditionals, as well as nested if's
and controlling while loops with for loops.
Added one more puzzle; for loops
Trying to rebase
Merge pull request #7 from themasterofrobots/master

Added new loop puzzles - rebased