Andrew's updated: Feb. 16, 2014
Andrew's update: Feb. 16 2014
Merge branch 'master' of https://github.com/vijakshay/Travel-Diary

Conflicts:
	Code/extractData.py