Merge branch 'master' of https://github.com/mhdkhadafi/sleep-quality-tracking

Conflicts:
	.idea/misc.xml
Updated parseData, correctly parses if it gets the lines...not sure if openFile works