change Index.java to DMS_isepApplication
merged conflicts
changes
change on gitgnore due to conflicts message
change fore gitignore