* safari 6
* fix
Merge branch 'master' of https://github.com/tansky/actiguide

Conflicts:
	out/style.min.css