Fixed some bugs...
FU
Merge branch 'master' of https://github.com/YnkDK/ml14-project4