union de proyecto para seleccionar que falta
Merge branch 'master' of https://github.com/proyect-IPUC/new-ipuc

Conflicts:
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/05307666b626ddfa9efc97cd72e36bbf
	tmp/cache/assets/development/sprockets/0a1762adceae6931bb4aef14f20ad27e
	tmp/cache/assets/development/sprockets/0cbf233881c896dbfea6a46e1e7a0f37
	tmp/cache/assets/development/sprockets/1027254ad9f9317017cee3f9f844a862
	tmp/cache/assets/development/sprockets/10fcfbe6ebae11a40c8eac41939a1b9a
	tmp/cache/assets/development/sprockets/1176ad455faf829a69c82f9b3699601d
	tmp/cache/assets/development/sprockets/1272b92193b4c7da894414c0309ebab0
	tmp/cache/assets/development/sprockets/1379b7b65689a419f054d11530d4cecb
	tmp/cache/assets/development/sprockets/1439cb38760e5c05a727db1206c15d7d
	tmp/cache/assets/development/sprockets/166c056119ebdfb8b7104c97b424b423
	tmp/cache/assets/development/sprockets/18e01d4621bb8cd3767edd0dd816781b
	tmp/cache/assets/development/sprockets/19ce6c425d4c775f7489a1794744f1a1
	tmp/cache/assets/development/sprockets/1a9a0f97d072b3641377bcd24a1985ce
	tmp/cache/assets/development/sprockets/1afdd0915f3f69cc08a2fbcd15c1df3d
	tmp/cache/assets/development/sprockets/1b9c0900553d26de989edb8f5ff73693
	tmp/cache/assets/development/sprockets/21bdb7ce7192d599fda2186ea312e888
	tmp/cache/assets/development/sprockets/22a3157d204c1f8e417a25f01a2dbe45
	tmp/cache/assets/development/sprockets/22c124f85201eef5eb3d2b86e1872e9c
	tmp/cache/assets/development/sprockets/23be7eae08a4b535658cd404bfd26c47
	tmp/cache/assets/development/sprockets/267cc82647c74a8138237b346a2d256a
	tmp/cache/assets/development/sprockets/27054bef526998417b620b70b2397a4c
	tmp/cache/assets/development/sprockets/2757e6e4137fd1a566b588958c804e4a
	tmp/cache/assets/development/sprockets/2757fae967a52701ef3724ae5a76c4a8
	tmp/cache/assets/development/sprockets/27aa7abfdefd45da1cde219bc717fbcf
	tmp/cache/assets/development/sprockets/280e1ab04f64cfa2cb7b6935ff4125df
	tmp/cache/assets/development/sprockets/28fe2343a2de4f1becf8a43d3a65e234
	tmp/cache/assets/development/sprockets/29799261c5b1ef346c862882d7b572ad
	tmp/cache/assets/development/sprockets/29a7394b73b8aaf6d18e1814239b04d6
	tmp/cache/assets/development/sprockets/2a611efea3baca15ec600d7e9d0e2154
	tmp/cache/assets/development/sprockets/2bcaffef77ed02bba047259556b23347
	tmp/cache/assets/development/sprockets/2cb63a68075172224a5e89c9ae8b7c8a
	tmp/cache/assets/development/sprockets/2e30a909d33f34a0df6228e7fc1de7b7
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/33757b29e9aa4d6a3730dacfd6d40517
	tmp/cache/assets/development/sprockets/3553765c1b25284fe7deb6f6af3edf7c
	tmp/cache/assets/development/sprockets/3b6dcd003fc0345f0451081fc42b30fa
	tmp/cache/assets/development/sprockets/3bb2a592dec77fb57ba321c66ce15059
	tmp/cache/assets/development/sprockets/3d0b5c5cf27e056e3ec548752a38ad28
	tmp/cache/assets/development/sprockets/3d2abf203ad0aaee151292b372543b77
	tmp/cache/assets/development/sprockets/3ea5bb256ff6a9f28ef3d19f7d1273ae
	tmp/cache/assets/development/sprockets/3eb2c9d8c3012b2648b64c74eb013bab
	tmp/cache/assets/development/sprockets/41b0f7fa46f3bdaa4d692deda8a1baef
	tmp/cache/assets/development/sprockets/438105278ae62aa5b6a70dc09983e98c
	tmp/cache/assets/development/sprockets/45435f0c47e3b1eb64f7b3ab0a98e97e
	tmp/cache/assets/development/sprockets/4ad413f3e3326481d2f5f9327bbd0e12
	tmp/cache/assets/development/sprockets/4cf539618227bd6760cae4640de40828
	tmp/cache/assets/development/sprockets/4daff1d5b8e6da6d2ed55886db193ef2
	tmp/cache/assets/development/sprockets/4ea33e825e6e38bd22dccab488a0255b
	tmp/cache/assets/development/sprockets/4f1254a16727942140e039a2d2b2d0bc
	tmp/cache/assets/development/sprockets/500b6b7256680e4798ac404489bfb1cf
	tmp/cache/assets/development/sprockets/526ac107bd24cf9cb395c2ccdfefb6fc
	tmp/cache/assets/development/sprockets/54835383e4ea5f5de07203c6d22edd70
	tmp/cache/assets/development/sprockets/562c2d168da585f80579347d10790a0a
	tmp/cache/assets/development/sprockets/5717c79c5abd7e572e80fe6b81413c89
	tmp/cache/assets/development/sprockets/57cbd4c35f04ee53051722fb7a5d73a2
	tmp/cache/assets/development/sprockets/5927875f6743878533fe897738e1250a
	tmp/cache/assets/development/sprockets/5a947ad178d9668aa95692e30deb9b44
	tmp/cache/assets/development/sprockets/5c0b4f42bc16b8229ec86a89229e7d4e
	tmp/cache/assets/development/sprockets/5e30a6b911437f1428dc32c3ae182123
	tmp/cache/assets/development/sprockets/6349478b5026cd0e119123837292575e
	tmp/cache/assets/development/sprockets/6654975eaa53a225d976278fcb6baa00
	tmp/cache/assets/development/sprockets/6746d386aa136df93fcced726886d5bb
	tmp/cache/assets/development/sprockets/685f0f61426b98eae00e3fbb55ccfc42
	tmp/cache/assets/development/sprockets/6b7e97595c37161f619adfd2b7724ea2
	tmp/cache/assets/development/sprockets/6c0f2a2c7346b84a92e2cb81473e251b
	tmp/cache/assets/development/sprockets/70abc04610add695690c60f4dd579f70
	tmp/cache/assets/development/sprockets/72bfe22e019bb22d0035dda92db074ff
	tmp/cache/assets/development/sprockets/73757d7c9619e1e824077f1fd3667102
	tmp/cache/assets/development/sprockets/75d70335075338b94b8e0083c37899e3
	tmp/cache/assets/development/sprockets/7a1582e70c6db7795d58dc056a78f9a1
	tmp/cache/assets/development/sprockets/7bc004d13eb348ce433ad2a2963aed56
	tmp/cache/assets/development/sprockets/7be9086c960bb4384c9d23a52e489f29
	tmp/cache/assets/development/sprockets/7f8ca063f93e451d916a9146d3926803
	tmp/cache/assets/development/sprockets/7fb23b9147d393a5d42b4290b14011d4
	tmp/cache/assets/development/sprockets/7fd9aba0a3aba31332e5c0901e933acd
	tmp/cache/assets/development/sprockets/7fe72ac1c0db1a7e8e7f59cf25e8a39e
	tmp/cache/assets/development/sprockets/82b37ae9eccec44c1ef44cfdd07d8534
	tmp/cache/assets/development/sprockets/82bf9ccf676306bdcc8b878f9e3ad902
	tmp/cache/assets/development/sprockets/84d4afb6856f811a323501bdcc5bf518
	tmp/cache/assets/development/sprockets/857ec02036357b0e6ea63aa10e819e83
	tmp/cache/assets/development/sprockets/85ae64edf528ce6e981889f3f3c285d9
	tmp/cache/assets/development/sprockets/86f909bf5baee50515afadaa3ce2df8f
	tmp/cache/assets/development/sprockets/88224f26c865999a021178a7e049b026
	tmp/cache/assets/development/sprockets/88d619ecb1068dbdbe8eba7c0056e44c
	tmp/cache/assets/development/sprockets/8aaf7634108fa9ba801387d2f961b59c
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/development/sprockets/8d7169a51709ca68da03f36057750c99
	tmp/cache/assets/development/sprockets/8dece12f6e7e987bf422b942e7511347
	tmp/cache/assets/development/sprockets/8e5a9738e9bc15478e026d98335454f9
	tmp/cache/assets/development/sprockets/8f8936f164170e095c5ca2d0c2ae6127
	tmp/cache/assets/development/sprockets/90fc311c95a685477f8b0075ffd5b1f0
	tmp/cache/assets/development/sprockets/9137548679597bdf28bc9b47104c1c77
	tmp/cache/assets/development/sprockets/91e53bdf30a2b8e78bf99ca794addf70
	tmp/cache/assets/development/sprockets/95ad176b3a7b7ad43f5ec79287957e2d
	tmp/cache/assets/development/sprockets/96c8a359d272a17849ef34c41615dcc7
	tmp/cache/assets/development/sprockets/977ead1d20bc9f7e1c191bd4348f9e3a
	tmp/cache/assets/development/sprockets/981fdf59c6c819da5a85424ee749e704
	tmp/cache/assets/development/sprockets/99679cf9c113075a673280ca050ac1f2
	tmp/cache/assets/development/sprockets/9dc4299f005f97ffffcc61aa9788f2f2
	tmp/cache/assets/development/sprockets/9fab2d5493beec802960059a5f9e1478
	tmp/cache/assets/development/sprockets/a276bc7c30da4b57cf94105bfb28ce11
	tmp/cache/assets/development/sprockets/a7c2d6828abec3c7feb29c3bddd08398
	tmp/cache/assets/development/sprockets/a995a3b95e4a7b0e5b9fa7c49efd6b74
	tmp/cache/assets/development/sprockets/aa2b57af374c134c3b48b23bcb825a16
	tmp/cache/assets/development/sprockets/aa61726715c46ea17a59c216bcadaa29
	tmp/cache/assets/development/sprockets/acd9281b9871a4c8ed76c67584c59cb8
	tmp/cache/assets/development/sprockets/ae4ad05ad8c4c21bdbc68b9a260302c2
	tmp/cache/assets/development/sprockets/b150860fa4b8c9d01f5a19c2a3aa5c32
	tmp/cache/assets/development/sprockets/b3442a786c912de20919a4fc2a443c8e
	tmp/cache/assets/development/sprockets/b3da405f1e68470ad6146a1322f2438c
	tmp/cache/assets/development/sprockets/b6c6fbf7ec18d5cd2f5cca5ab190c8b4
	tmp/cache/assets/development/sprockets/b7190cb3a19487e1eb949c63735986f2
	tmp/cache/assets/development/sprockets/b7d60dd0218956953d1afbb4d6d95220
	tmp/cache/assets/development/sprockets/b7fc7a50cc3464d16f378714639f14e2
	tmp/cache/assets/development/sprockets/b8c27106dd687bc241cc3cfe21d838b6
	tmp/cache/assets/development/sprockets/b900ab517c1e2a3b8e545e09ed1d553d
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/bd3936370d0f952ada5774e2230046ed
	tmp/cache/assets/development/sprockets/bf39f4eb8e6047f2677752d3e25fce1e
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/c1d685ab598a776d4ab25de14feca568
	tmp/cache/assets/development/sprockets/c26711fbf03cb9d5ba603a7669a252bc
	tmp/cache/assets/development/sprockets/c64e76b40ddb8b15365b0d2e26a1cde0
	tmp/cache/assets/development/sprockets/ca92fb6c9590d204906dbe068a3ea7cf
	tmp/cache/assets/development/sprockets/cb4c2452aafb889fff938f630b33d20b
	tmp/cache/assets/development/sprockets/cbd037e1cce49b533611e59d1dacd49a
	tmp/cache/assets/development/sprockets/cf04854b81873fc06a5dfc89d1dafe5d
	tmp/cache/assets/development/sprockets/cf1e3cebfad43293c3c470a5e437ebc9
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d0cd584b2eb40a42599589770bbba3ed
	tmp/cache/assets/development/sprockets/d0d9a42a3282984c10968f94a50009a0
	tmp/cache/assets/development/sprockets/d585a06e2ee6203ccb04c8b84150d14d
	tmp/cache/assets/development/sprockets/d61591e775fa6aa7220000fd4af12ee8
	tmp/cache/assets/development/sprockets/d947403658b9c66b65075375aebf5e66
	tmp/cache/assets/development/sprockets/d9b553d21a9209af6093c2c196037be3
	tmp/cache/assets/development/sprockets/da4b9993d9be4ae381c6aa436412e9c0
	tmp/cache/assets/development/sprockets/dcf8e9e34a16b437528115e2961c71d0
	tmp/cache/assets/development/sprockets/dda0f614553b052fa0fceeaee2cf226b
	tmp/cache/assets/development/sprockets/e05be1be6020ddb92044016cbff6079a
	tmp/cache/assets/development/sprockets/e08053927ba6bcb7a86d273c4ff4ac54
	tmp/cache/assets/development/sprockets/e1aa402390382db4d97b27cb094485fa
	tmp/cache/assets/development/sprockets/e2e8f7f4c2e46b20bbaa95d67e83c41e
	tmp/cache/assets/development/sprockets/e459168835a5f27b832ace20874f7c10
	tmp/cache/assets/development/sprockets/e5498f306cef385764158d89b66f2e6c
	tmp/cache/assets/development/sprockets/ec56619730d9f32ecbb26789ced37dcc
	tmp/cache/assets/development/sprockets/efc632af907bcaf270f2c13887ebdfd0
	tmp/cache/assets/development/sprockets/f1ff0b77c70e6bace4c5daa8f317c8ff
	tmp/cache/assets/development/sprockets/f45d987f705969ef06fe5dc5e0a84a74
	tmp/cache/assets/development/sprockets/f644fd75cbead0e58c847aa16546e2a8
	tmp/cache/assets/development/sprockets/f72f840ca07d7d3d5b5686550ea94c70
	tmp/cache/assets/development/sprockets/f793c4a04c580812d161bf757b6681a5
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/f81ef22356076e422f5227369b10fa60
	tmp/cache/assets/development/sprockets/f8c70cf2f15c3ca9f5197a0d1882b33d
	tmp/cache/assets/development/sprockets/fa6b53e34e4abad5deba3f8a4b016f50
	tmp/cache/assets/development/sprockets/faee2b7b8b2eced0fcb40695465cb8a7
	tmp/cache/assets/development/sprockets/fc6819cb70ddf39c06c6e7ee44213adf
	tmp/cache/assets/development/sprockets/fdb203074e9bcb611cd0565314ce9a7f