Added functions to css.rs
Merged master and fixed errors.

Conflicts:
	css.rs