css fixes and merged js-files
Merge branch 'master' of https://github.com/lafkon/fontain