Merge pull request #51 from cgoodling/origin/abby

Looping partially finished
Merge branch 'master' into origin/abby