commits from the project on imac
Merge branch 'angular_branch' of https://github.com/ctwhome/coolblue into angular_branch

Conflicts:
	.gitignore