I just added a line
Merge branch 'master' of https://github.com/MattNewbill/android_advising_system

Conflicts:
	README.md