Removed excessive text from technologies.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	technologies.txt
Fixed error in data file