Making sure I can commit and push properly now.
Merge branch 'master' of http://github.com/se-SteveThePirate/CMPUT301W13T01

Conflicts:
	Recipe Book of Awesome/bin/classes/ca/dreamteam/recipebook/R$string.class
	Recipe Book of Awesome/bin/classes/ca/dreamteam/recipebook/R$style.class
	Recipe Book of Awesome/gen/ca/dreamteam/recipebook/R.java
	Recipe Book of Awesome/src/ca/dreamteam/recipebook/Models/Recipe.java