added functions
Merge branch 'cristi'
added sass
Merge branch 'master' into cristi