initial
initial
Merge branch 'master' of https://github.com/CMgolfu/device_htc_golfu into cm11

Conflicts:
	README.md
Merge branch 'master' of https://github.com/CMgolfu/device_htc_golfu

Conflicts:
	README.md
Merge branch 'master' of https://github.com/CMgolfu/device_htc_golfu into cm11
Merge branch 'cm11' of https://github.com/CMgolfu/device_htc_golfu into cm11

Conflicts:
	README.md