added support for int to float promotions and support for cin
Merge branch 'master' of git://github.com/kalvinnchau/cse131