Updates src and CSS.
Merge branch 'gh-pages' of github.com:sapo/Ink into gh-pages

Conflicts:
	assets/css/ink-flex.min.css
CSS