updated local project with git version of project
Merge branch 'master' of
https://github.com/kylejamesross/CMPUT301W13T09.git

Conflicts:
	CMPUT301Project/gen/com/cmput301w13t09/cmput301project/R.java
Minor UI changes
added some more test cases working on testing the email stuff
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git
Accepted defeat (testing emails is difficult) minor changes to test
cases
updated InstructionModel Test, RecipeListModel Test, RecipeModel Test
and added search recipes test
added data checker test template
Made sure all the backgrounds are right.
create a exit checker for editing recipes
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git
Added the site where the app can be downloaded
CHanged all the tests from junit tests to android junit tests
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git