hello friends`
Merge branch 'master' of github.com:harastyn/Teamkhaleesi

Conflicts:
	angular-seed-master/app/partials/partial1.html