Changed so that instead of 80 character limit, it would automatically change based on the width of the terminal
Merge remote-tracking branch 'upstream/master'

Conflicts:
	jarvis
Merge pull request #4 from jacqt/master

Changed so that instead of 80 character limit, it would automatically ch...