use default ipa320 .gitignore

.gitignore

@@ -1,26 +1,42 @@
+# default .gitignore file for ipa320 repositories
+# master file can be found in https://github.com/ipa320/care-o-bot/blob/indigo_dev/.gitignore
+
+build/
+bin/
+lib/
+
+# generated docs
+*.dox
+*.wikidoc
+
+# eclipse
+.project
+.cproject
+
+# qcreator
+qtcreator-*
+*.user
+
+# Emacs
+.#*
+
+# VI/VIM
+*.swp
+
+# python files
+*.pcd
+*.pyc
+*.pco
+
 # temporary files
 *~
 
-# autogenerated folders
-bin
-build
-lib
-__pycache__
-msg_gen
-srv_gen
-
-# autogenerated msgs
-*Action.msg
-*Action.py
-*ActionFeedback.msg
-*ActionFeedback.py
-*ActionGoal.msg
-*ActionGoal.py
-*Feedback.msg
-*Feedback.py
-*Goal.msg
-*Goal.py
-*Result.msg
-*Result.py
-*.pyc
-.metadata
+# merge conflict files
+*.orig
+*BACKUP*
+*BASE*
+*LOCAL*
+*REMOTE*
+
+# Catkin custom files
+CATKIN_IGNORE