live changes
Merge branch 'master' of https://github.com/jaiwalker/starterci

Conflicts:
	.idea/workspace.xml

live  chnages
Merge branch 'master' of https://github.com/jaiwalker/starterci

Conflicts:
	.idea/workspace.xml
 fixed up the images each issue