Merged with remote.
Added new features
Merge branch 'master' of https://github.com/jywu/530Summarizer

Conflicts:
	project_code.py