Organized files in directiries and make the html clean as it should be. Also added .gitignore file to help with the conflicts
Updated .gitignore + rollback Properties folder (the project doesn't compile without it..)
conflict in index.html