Switched over to bootstrap.py script
Fix typo with bootstrap.py
Merge remote-tracking branch 'root/master'

Conflicts:
	main.ninja