Now with indention
Merge branch 'master' of https://github.com/SeanGavan/382-Lab-2