sass files added
index and sass files
clear
Merge branch 'master' of https://github.com/lassenorgaard/cocktail

Conflicts:
	index.html