Updates

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>
Merge branch 'master' of https://github.com/qi-interactive/sherwoodsoho.com
Updates

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>
Merge branch 'master' of https://github.com/qi-interactive/sherwoodsoho.com

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>

Conflicts:
	js/retina.js