updated formular
Merge branch 'development' of https://github.com/casherart/WebtechGroup8.git into development