Some weird conflict happened with the app's iml file.
Merge branch 'master' of git://github.com/annechristy/5CMenu

Not sure why there's a conflict here.:
merging the new files to my remote repo
Merge branch 'master' of git://github.com/annechristy/5CMenu

Merging to incorporate the new web scraping classes.
Merge branch 'master' of git://github.com/annechristy/5CMenu

Merging after pair programming to refactor our architecture.
Saving my broken code
Resolving conflict
fixed conflicts in DataCollector
Merge https://github.com/annechristy/5CMenu

Merging Annie's style changes in xml files with my work.
Finally got the correct data displaing