Update basic_project.py
Merge branch 'ade_branch'

Conflicts:
	basic_project.py