Merge branch 'master' of https://github.com/macmania/UITeamA

Conflicts:
U1_1.py
Unit1/Text7Colloc.py
added frequency analysis
Merge branch 'master' of https://github.com/macmania/UITeamA

Conflicts:
	Islip13Rain/10.txt
	Islip13Rain/2.txt
	Islip13Rain/3.txt
	Islip13Rain/4.txt
	Islip13Rain/8.txt
	U1_1.py
	Unit1/Islip13Rain/10.txt
	Unit1/Islip13Rain/10.txt~FETCH_HEAD
	Unit1/Islip13Rain/2.txt
	Unit1/Islip13Rain/2.txt~FETCH_HEAD
	Unit1/Islip13Rain/3.txt
	Unit1/Islip13Rain/3.txt~FETCH_HEAD
	Unit1/Islip13Rain/4.txt
	Unit1/Islip13Rain/4.txt~FETCH_HEAD
	Unit1/Islip13Rain/8.txt
	Unit1/Islip13Rain/8.txt~FETCH_HEAD
Merge branch 'master' of https://github.com/macmania/UITeamA

Conflicts:
	Islip13Rain/10.txt
	Islip13Rain/2.txt
	Islip13Rain/3.txt
	Islip13Rain/4.txt
	Islip13Rain/8.txt
	U1_1.py
	Unit1/Islip13Rain/10.txt
	Unit1/Islip13Rain/10.txt~FETCH_HEAD
	Unit1/Islip13Rain/2.txt
	Unit1/Islip13Rain/2.txt~FETCH_HEAD
	Unit1/Islip13Rain/3.txt
	Unit1/Islip13Rain/3.txt~FETCH_HEAD
	Unit1/Islip13Rain/4.txt
	Unit1/Islip13Rain/4.txt~FETCH_HEAD
	Unit1/Islip13Rain/8.txt
	Unit1/Islip13Rain/8.txt~FETCH_HEAD