Updating

Made a ton of changes. To fall in with project specifications.
Merge remote-tracking branch 'origin/master'

Conflicts:
	PA1_template.md