add function
Merge branch 'master' of https://github.com/tampham47/emberjs-hrm

Conflicts:
	index.html
update conflict