initial commit
beautification of files
Add xml file type
Adding Main.java to test FileTypes.java
conflict check
master branch comment
branch comment
branch merge
Merge branch 'master' of https://github.com/arongas/test