Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	.gitignore
	latexmkrc
	make
	mutt/muttrc
	offlineimaprc
	vim/mySnippets/all.snippets
	vim/vimrc

4 files changed, 72 insertions, 0 deletions

diff --git a/passwords/gmail.asc b/passwords/gmail.asc
new file mode 100644
index 0000000..08de50b
--- /dev/null
+++ b/passwords/gmail.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hQIMA2AwAsuYqCfXARAAyjVQBvW4y+mrxVRSUFmbRNoKhxaheAiqcFmOxOA41I0o
+yXQ2798T46KMeg2hQlq0JgdSKzIx9glZ5vuSYZ2IO7KFqZ+otW3XMh6xqZ/TF68g
+kc93FF8bTXHl/oThBJhgkrn1eGu2qwJFeAXWgBE79VBLrJ7dMhyJHpsJzVwW09AP
+O5BP89noyqa6qP1seep+/d7AuOoHYmFRF647L1a//mphfit3Z+ckGRaDi3mBEJbm
+YRsnJkLGO7Vc22JcgrDu1lsWa4ChXbOg9E1x2+75tIkaUVSq4dH1HII8zhb1pmdL
+C1VPS0ndADE9WHAcjvuCVNHlsgRxm0dgnIL06kY5U2LhQ21AARMYNepkl5aHaXZg
+mjIOu4qll31RKQtntZ1cc8vVXV+1FLjpYz7GapbqQ+ylVQf4lecSrPioCCtD7TzF
+GqHNfS4X1Va3/qMG98cTI3P0RjK1YMvOoqxSrWbQcJTKU8fiq+COQungipq10lpi
+/bHbQHVqrbFMI3vzAh6BHdSaIYkuz1fzNNTYbDUyHBV5KDbme8qIQZsIjpJ/yX1H
+O2dw6lF3dNo+huf157KfL3pTwD8InyB4Hm6Aa1SQPBCrO495BpyKrZTWTlSO08+4
+ycFX+Xx8F/GN9i0G2IJUCyU/2AV6fLZAStuQIw3AMzwkb1NJ9bMAdSeU9MZR+qjS
+TwHNHEP2LonaHTsbogdURSLeK7jtdKiPZYC0bKwQZJxEIwmDZZedweeufs5WLKjf
+1Sh3VvJXlruAZJcJw6kGdyv0jddzHT0qu6qQ3V6x0KQ=
+=Mfz/
+-----END PGP MESSAGE-----
diff --git a/passwords/hotmail.asc b/passwords/hotmail.asc
new file mode 100644
index 0000000..dd7f078
--- /dev/null
+++ b/passwords/hotmail.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hQIMA2AwAsuYqCfXARAAzPBo5qPX17TyoiGz6kls7JMP+7BSbpx5DhKGp6WHinrg
+VdR9VmMKN9KpoJvUD7JQpHua1FTBd2m++8npIThxKD7MaJgph+15oqTOuvf6rdrD
+3+51UR5bwbknt7BDrvtX0ueMR05TcgCfoC3R6orbesTkbwaiy3uzatpMRlMBf/1c
+ntb18Bluqg0KUie73Lpsmc52aRhAJF8dJgEk8qfbhd/sop3wuSbJgBWXxAcukgR6
+dKM7LI9lGu9z39VubRetE+G8fOb/oWGdqfUjHoWM1huMKztnJFS/ftd6zCh8wwDk
+NrK+46pOLhi8ARPBEaCg01BK8JT42s+NE7mFneqlnK0g4rAWGDN3GUEGZMxOtUKb
+gJlLuaQINKLTwy0Y2W5YUk4vbnRj4J0cs9tW/RyUB0t/o0bwKqB7k8hhmq4MJ5IM
+2OzaAapw5ogZtf/+eww8L2UMgS/ESmJaQHl6kTzdsPI/WXpMATNf0qqFZ1FjRC/U
+xEudfo60QumvH6JxO9rUR0a+dookI99emaFLyfNH7hIqGP8X6C5vRaruUCZtYufC
+o2W3v1rLPAnKvVGli9ZxyetfXeolUwpKxHBwAAv3QNRONrzEfHOifvnCLlR8+n6K
+FZvgIxengHKRnTwduJQE4td1LcjgWHhlpmPAcB6y0tddBLFwwUdNtPUSRsNQ/4nS
+SQG/+mPrLscTKjxIIzaNUlXWKrrdBTism+ITSq96BKbNILR6M5Am9b5BZPLEY16e
+izq7zYPh5PntZIm71rOMHb2GBiKcuH0UjXc=
+=QzUQ
+-----END PGP MESSAGE-----
diff --git a/passwords/imperial.asc b/passwords/imperial.asc
new file mode 100644
index 0000000..69c898a
--- /dev/null
+++ b/passwords/imperial.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hQIMA2AwAsuYqCfXAQ/9EvZHVmMGZPRW+046vwxMV8QisZXGfA9BKcR4qAKGaylA
+Eb/eJ+XnrVBoqnXdZdNMMeIXPkWGvPI7CEW++h7YOGm3/wgk3hUUIVAK36UwtCtl
+DojOHDL4/HUnxFQaDkSuZUjnay9yPWROmUQYSK0O5EcvtuLEwPU6n3wECVb90FLe
+GEBsRJJQaJ7dhdBC6/rcVUnaYH2ruzd/skDZRsIrCDyn+Nva5WPhpre3nJeYFfb2
+wwz9nv/2YDvlKahWXrzX8lQlwjBltrHteER/QQxHES6xOgkv0I8frYT+MXlLAVj1
+o6gHGOJiiNugFWr1XO+xrmbUirjxiBh6urIYdey/fJBqc77g8DPpTDD4WuZJoRG6
+5iVqxzoEOwqmtBUoaFuG6Ide5aTUL7SYPZ2nfdqrNYzNCAeLKgKJbbpAWXbzaLOn
+04j1S1zPO9hzDPNP9HDu7ZGoHStMaJF2ydA15kK9L7F4oUGb9y2lonGP2N5WNLjy
+AY4jlWenXGib+gMNoLQLUarZDcZV1bwTZvTX5fu7XB7634/aC7WOetnCU23VAkvw
+DkUHmoMCoH/meTRqNENttRNgQtXd/h5lJotvNINid2PBM2TDGCzzSPluHNPWYdHh
+2QjiWU0wZaY3GyNWEE9GDejusw05R+QUkoM+dy6hojHwf/1WkfhZBdH/ivRooavS
+TgGPT2dqxi/Ac9mKCbyxA1EdrZ1h/ou3N4UyCTim14wbdjpkg7+CNjGv1CjesdBZ
+WqjgZeSeTe9n8qSKlSodhYmSdz/1OlZiBONx58PKwQ==
+=Lbhd
+-----END PGP MESSAGE-----
diff --git a/passwords/main.asc b/passwords/main.asc
new file mode 100644
index 0000000..a31d6c3
--- /dev/null
+++ b/passwords/main.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hQIMA2AwAsuYqCfXAQ/+OoXBGvfhxrv1n/kR2h8Q4/jwhjQ+UlrL/F7bk3BR/ggy
+dHhH230/Bcet4DzjBSqvC4UrxtWDLu2+Q+C1WaiIRgQ6Dor/aTx4ouJbJfMQhIH2
+zayNTWRoqsJ08NwTd0q4kVXkYF0R/rHdgMX6ornaW2sN3wAxd/3wMBNYbDlMr7Es
+ga9tCKHggMrOS/D1+JnxqK8akrNO3AmJoAjMUDxu59+DPGirVrq92GuTH6du/Gb2
+diCaE9ruVHpPZh2UOIU/4EWbiqP5Pr2U7PnUmW6E7Dm7yu/488op4XA0Uda4hUEB
+BoNTBcYt7An/+ZP5ve4EHOLGB/VALjqYhVbwLDQATfAg8gtkEmCohTy9EAFUKOZY
+3xIi/+7OElZBikBMkKhieccG99QvNLwRbzVie1IkhefFuRipytidZ28WgoFFGf/R
+izP+UjwmHRqYyNWrobBszmCogE3cpU5urk4iZCBMlwpqkeUFi01aPzRgaDBbCn2j
+9MML2xJZvz2/itHCjGsb5u0tlp1ItIk/Lg3Uh1UFyyxxZuIPbCWeCZ+sK0Kq8wPC
+E34Sri3Pa60dOWIkf7zPVpR8oE6CCq8X8/taDLAdCzvadG7qt4YALlGn2W8sgN7G
+y0aAKafA6IvLgXx5jQZ45jBEYbvAQ39bSjpXY1AS6TlU2aqTh3VgBHvHzjube/nS
+TQFRL4q9jgt2jhpPKYD8RLGhtHAUtKaEINpSAfzdbqVaQDAMX+a9vCTRvLcmhaOj
+Nk2LrgAT2RGc3q04Nfo3pZ7qE0j6hRy2xrMoQggc
+=2CB6
+-----END PGP MESSAGE-----