Minor fix Master.php
Madusha's temp files added
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
What the hell is this workspace .xml file?! It's causing a lot of conflicts when pushing... -_-