issues

Signed-off-by: cameronlockey <ctlockey@gmail.com>
Merge branch 'master' of https://github.com/cameronlockey/devopstest

Signed-off-by: cameronlockey <ctlockey@gmail.com>

Conflicts:
	css/styles.css