testing dummy
Merge branch 'master' of https://github.com/SaveThatDish/STD.git

Conflicts:
	SaveThatDish/testFetchPush/DummyFIle
Got facebook login to work!
Fb works...
Merge branch 'master' of https://github.com/SaveThatDish/STD.git

Conflicts:
	SaveThatDish/.classpath
	SaveThatDish/src/com/example/savethatdish/MainActivity.java