Removed an unwanted file
Changes made on March 26th
Changes made on March 26th
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.cafarc