added the bin filed to ignore list
Merge branch 'master' of https://github.com/mshem/155bFinal.git
Merge branch 'master' of https://github.com/mshem/155bFinal.git
added the gen folder to gitignore
some automatic formatting