Update changes for conflict testing
Merge branch 'master' of github.com:ranggageni/Genius

Conflicts:
	development.txt