internet required added
Merge branch 'master' of https://github.com/john098/HCFTW

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/john098/HCFTW

Conflicts:
	app/src/main/java/com/example/johnpham/hcftw/Calender_.java
Merge remote-tracking branch 'origin/master'