adding a blank text for testing
adding testing 2 txt file
Merge remote-tracking branch 'origin/master' into vincent
Merge remote-tracking branch 'origin/master' into vincent
Merge remote-tracking branch 'origin/master' into vincent
Added DBConnector class. Only implemented insert statements
Merge remote-tracking branch 'origin/master' into vincent
added new files FoodApp UI
Merge pull request #21 from dolob-mrmr/shah

added new files FoodApp UI
Java files and android manifest 06/09/2014
Merge pull request #22 from dolob-mrmr/jeremy

Java files and android manifest 06/09/2014
Merge pull request #20 from dolob-mrmr/hamzah

Added DBConnector class. Only implemented insert statements
Merge pull request #19 from dolob-mrmr/zhihao

updated sprint 2
Merge remote-tracking branch 'origin/master' into vincent
 This folder contain the camera API and PHP file
 take photo and upload to SQL DB with php file
Merge pull request #23 from dolob-mrmr/vincent

Vincent
updated user stories 90% done on 13 sept