something stupid with the library files

its very very stupid
Merge remote-tracking branch 'origin/iago-programming' into taylor-programming

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Scenes/Main - Lives.unity
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/metadata/00/005656bced889b542a3bf808084700f8
	Library/metadata/01/01d0c936148ad12428775a54119f5c04
	Library/metadata/01/01f56f181ea2d8a48a86f054474988e1
	Library/metadata/03/03b025823c7e4914da7f51b1756e5e3a
	Library/metadata/04/0428f8f60fa9fc44fbc83b1388991bca
	Library/metadata/08/0806e83cc5bf9f745b9393a4248b867a
	Library/metadata/09/0939ed6c7613e5e43a5cdc04a678a966
	Library/metadata/09/09c208b4ec7eade48a2fd29a6b4990e2
	Library/metadata/0a/0a4a878577c88654795d8c6aee74368d
	Library/metadata/0c/0c5e6f3665051a24c8deca6e53bdc587
	Library/metadata/14/144032073d79c0644914a9fa2b44ce33
	Library/metadata/18/18b12ef6477c5d34faa97226b8055166
	Library/metadata/1b/1b1aeedcfda30314c8183703eb3b1e5d
	Library/metadata/1e/1efcf3b84c99d3041b869d559d696634
	Library/metadata/26/268348a3ce4a06842a2701c3f9a20717
	Library/metadata/27/276699a28e3b12b45b5603b31161254f
	Library/metadata/2b/2b0d59a2b9c662645b1a1548e13b8b5e
	Library/metadata/2d/2db969756433ebb46a2a069c1ef5190e
	Library/metadata/2f/2fa299741bd124248bc36d657eb4e432
	Library/metadata/34/349118c2d8d95a240892835f9a939619
	Library/metadata/35/35452be164663f146b8829318f9c05eb
	Library/metadata/36/36e1d3a725d052b48a97f62725e5f50e
	Library/metadata/37/37a3e1d19b6969b46a04f454ed40a42a
	Library/metadata/38/386b367291644dc4a994cfd6f330d40f
	Library/metadata/4c/4c4e2225904897741851cb40a292d928
	Library/metadata/4c/4cc8814ed8715f445bad8716f0a84360
	Library/metadata/4c/4cd39bda2d8bf48d1927218f43a3df3d
	Library/metadata/4e/4e131a19682f7da4995b1ed5f1db5725
	Library/metadata/50/505a4aa2be60a31478dc1897f8d21084
	Library/metadata/51/51decac5933324a4ebb5df8e33571cc3
	Library/metadata/55/554e20056aaac284ab56c431c6af0c5b
	Library/metadata/56/5679168ed7d9751468281847b1e4f513
	Library/metadata/57/5705f2fc1302ea340a90c9525cc0428b
	Library/metadata/57/57233c6ecf2fc0c4e879d17d552e63e3
	Library/metadata/5e/5e89a6bd2faf12145b9ec77fa3de6258
	Library/metadata/6c/6cfd453c36386934689fb42db3299dbc
	Library/metadata/71/71653ee8cab41304bbd53f3e5aee2f21
	Library/metadata/72/7280812eccadc1e47b7402e6d9679e5c
	Library/metadata/73/737211ff6e83c5f4babd40d5cc5b2e94
	Library/metadata/74/745f5928c8c612a45bc36f1bf3abb156
	Library/metadata/76/766942a75e07e4b44b3d17844bc185fb
	Library/metadata/81/8169f2b1f609f6a40bccb3984082e45f
	Library/metadata/82/822d0fd127d4ff54bb00fe332e9da64d
	Library/metadata/83/8307261b94c5d8a4f99775a836199d20
	Library/metadata/8a/8a499e7c18f95184e9df7b63d375f25b
	Library/metadata/94/94b41969089e2534f847566630c65306
	Library/metadata/9d/9dea8a158a69bed4fa95c4876b3a9c86
	Library/metadata/a2/a296b1d27462d2546be67012ea4cdada
	Library/metadata/b0/b09fc2071423c284e996ba2c5ca29464
	Library/metadata/ba/ba3fb0ff29025d441bcfac317f4d4b33
	Library/metadata/c1/c16e3626e0b67354ca33cb38b1e9cac8
	Library/metadata/c7/c714d7632e59ce642b7aec3d035fee8c
	Library/metadata/c7/c7443c9a986c8a2458de5ddf18099359
	Library/metadata/c8/c84fc0455e556574fb9eae102e8905e1
	Library/metadata/c9/c98890007a14b3940a04585ef65e2b54
	Library/metadata/d2/d294f61111202e74bb9ff1fbb2c5aaa6
	Library/metadata/d4/d4b622e2ae4b7aa4abf761706845a53f
	Library/metadata/d7/d76cce1d794620346b2ef8868ec101e5
	Library/metadata/d8/d8f05a96f6d43d442a884ea5ba44713c
	Library/metadata/d9/d90198e2496d3cd4e8953a18eeae0b9d
	Library/metadata/d9/d9bd30f0086842a46b831d7e11af42a5
	Library/metadata/da/da323e2b403b83f48a9c5bc9e05ec0cd
	Library/metadata/da/da3340da097d9134a8011524cdf1db96
	Library/metadata/e4/e4e97d23f9bd614429d7e119e5d3cc51
	Library/metadata/e9/e950636c300acaa45a3365cbe5b186ab
	Library/metadata/ee/ee72fbea51aca2f40b0e33c8ad517ecd
	Library/metadata/ff/ffe6a388a543b98488dfeec1e73a8c9e
	Library/shadercompiler-1.log
changed the git ignore

hopefully no more stupid meta file conflicts
made some changes

new music, dot manager editted, simpler start