int float warning solved
Merge branch 'master' of https://github.com/vyrp/CCI36_Lab3