deleted master file to fix merge conflict
Merge branch 'master' of https://github.com/AndersEverett/pimp-my-fridge
"ok, merging master
"

Conflicts:
	ar_pimp_my_fridge/db/migrate/1_create_recipes.rb
readding migrate files
fixed merge conflict hopefully