Commit before pull
Merge branch 'master' of https://github.com/zohelfer/CS457P2

Conflicts:
	awget.cc
Modified awget to parse file and get input into 1 string