server_update
Merge branch 'master' of https://github.com/maxbbender/talos

Conflicts:
	css/foundation.css
	css/foundation.min.css
	index.html
	js/foundation.min.js