make this stuff heroku ready
Merge branch 'master' of github.com:funkylarma/funkylarma.github.io

Conflicts:
	Gemfile
	Gemfile.lock
	config.ru
	unicorn.rb
refactor views and css
Merge branch 'master' of github.com:funkylarma/funkylarma.github.io