first view upload
Merge branch 'master' of https://github.com/therapick/Therapick_v2013

Conflicts:
	application/views/hello/index.php