reorganazing files, deleting uml autogenerate method, and delete xml folder
add .DS_Store in .gitiginore
fixing errors
merge branching