updated foundation
added kss #359
Merge branch 'master' of github.com:hacken-in/website

Conflicts:
	Gemfile