while, loops, stuff
Merge branch 'patrick'