standard changes
Merge branch 'Jason' of https://github.com/Zenj1n/Watch-List into Jason

Conflicts:
	MyApplication/.idea/gradle.xml