Removed astyle
Merge remote branch 'origin/master'

Conflicts:
	report3/jam96/report3.pdf