Okay fixed the conflicts, pictures kind of working
recomitting tests
layout for add new recipe pic
Fixed alot of the setup for the Test part of the project,
The view recipe view now updates after a recipe is edited
Set up emails working pretty easy so far damn I jinxed it
Email set up to so message is automatically the recipe in a text form
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git
Can Almost email recipe files
Fixed some imports
I can't get this to work yet
The gmail attachments can't be sent
Merging files
HOLY SHIT WE CAN NOT SEND EMAILS WITH A RECIPE AS AN ATTACHMENT!!!!!
EVERYONE OWES STEVE A BEER!!!!