add calculated values
Merge branch 'master' of https://github.com/kyen89/project2
get stuff
Merge branch 'master' of https://github.com/kyen89/project2