Merge branch 'master' of https://github.com/nikhilRP/nobProject

Conflicts:
	main.py
Fixed conflict