Cleaned up code

> Rearranged functions
> Corrected formatting
> Improved Task class function name: getFullInfo to toString
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data