added a makefile , eddited some indentation
fixed plenty of bugs
Merge branch 'master' of github.com:nfarhat/Dev