ignoring sass cache, updating import
reversing changes
fixed merging error
styled kicklow template
styles to kicklow template
fixed sass error
further style changes
style updates
Removed sass cache files.
Resolve conflicts.
Added comment block to template function.
Merge pull request #294 from Webcraft-Myplanet/uf-457A

Uf 457 a
resolving conflict