Merge pull request #9 from francinen/master

git shit done
fixed merge conflicts
Merge pull request #10 from benweddel/master

fixed merge conflicts
Updated styling
Merge pull request #11 from benweddel/master

Updated styling