Merge remote-tracking branch 'origin/master'

Conflicts:
	github_demo.txt.txt

Changed from another computer

Changed from Pranav's laptop