trigonometrie
Merge branch 'master' of https://github.com/Bananamoon/WinFakt

Conflicts:
	assets/css/style.css