- added a feature where it can now put in "cm" or "in" into the knitting instructions
Merge branch 'master' of https://github.com/CaKlassen/DogSweater

Conflicts:
	app/src/main/java/group8/comp3900/year2014/com/bcit/dogsweater/classes/Dimensions.java