popup animation
Merge branch 'master' of https://github.com/callumflack/MSHealth

Conflicts:
	_sass/_css_style.scss
	css_style.css