fixed formula
made changes
work in progress
??
Merge pull request #37 from TatyaniaM/Dev

Dev
Merge pull request #47 from amandagroccia/dev

Dev