Merge pull request #2 from GreatBigBore/master

pc8 graded 2014.02.26
PC12
PC12
Done
done
PC13
pc12 graded 2014.03.13