till now
Merge branch 'master' of https://github.com/Lovelotus1st/nmhidta

Conflicts:
	app/models/drug.rb
	app/models/subject.rb
	app/models/vehicle.rb
	app/views/home/admin.html.erb
	app/views/home/index.html.erb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/C35/F80/sprockets%2Ff8d533044058889eb642084909741f8c
	tmp/cache/assets/C86/8E0/sprockets%2Faa2e4167925819bb24719074f873c3e4
	tmp/cache/assets/C8C/EA0/sprockets%2F767d7385d09346d295157c8f200dd45b
	tmp/cache/assets/C97/B90/sprockets%2F6bad8540ab9a067444f50000283d0b18
	tmp/cache/assets/CBA/8D0/sprockets%2Ff5f738b65b700d4d150982435be7b758
	tmp/cache/assets/CD7/930/sprockets%2F571882b91eacc26102538fd41ad6451e
	tmp/cache/assets/CDE/ED0/sprockets%2F080306b5ea487cf825ed9987c30060ba
	tmp/cache/assets/CE4/F40/sprockets%2F46ef378397125ec6711c3a9782ba5ca2
	tmp/cache/assets/CF7/970/sprockets%2F7052a4a3896df5879933af9b3f44c7d6
	tmp/cache/assets/CFC/B10/sprockets%2Fd3ed012d40c2bf060ae6e2625832e664
	tmp/cache/assets/CFF/9C0/sprockets%2F3e20475cebd7d6ba62c427307b523d32
	tmp/cache/assets/D02/0A0/sprockets%2F4ad413f3e3326481d2f5f9327bbd0e12
	tmp/cache/assets/D0E/DB0/sprockets%2F59e69ccb19c00189e6b8bbd14341c570
	tmp/cache/assets/D0F/880/sprockets%2F8f2511830f6e103d24928dac99a5cf5a
	tmp/cache/assets/D15/A30/sprockets%2F8d467b2390a5eab42a9d2d3d89792e32
	tmp/cache/assets/D1B/BA0/sprockets%2F88b64f06ad7839cb0736832dd1475ccf
	tmp/cache/assets/D27/7E0/sprockets%2F4ac321a5bd271c1f3ae1b588a3236b47
	tmp/cache/assets/D30/F00/sprockets%2F00149270baa6c3e25384cef2b80af68c
	tmp/cache/assets/D37/610/sprockets%2F0b13cb59d31c63c9be71248a0ae4e885
	tmp/cache/assets/D3A/BE0/sprockets%2F73d5b3d4a4584cbe9dfa3937b134c007
	tmp/cache/assets/D47/760/sprockets%2F31e4da844d7a83419e4716cd1cdf65f7
	tmp/cache/assets/D4D/0F0/sprockets%2F593477bddf1f5ef12d7549d1a687d6a1
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D51/0E0/sprockets%2F79091e7fa3ff70007ce8b464d559f5ed
	tmp/cache/assets/D57/C70/sprockets%2Fe3e65aa0dfe51ebb51e12246141fb443
	tmp/cache/assets/D62/210/sprockets%2F0c9f5a68e10c76b2d39acc37bb242e22
	tmp/cache/assets/D63/040/sprockets%2Fa090e82573ed07cd5cd3d718b213a6cc
	tmp/cache/assets/D64/960/sprockets%2Fbe9ae040582a5bdbd5252e73d1f1077f
	tmp/cache/assets/D66/E60/sprockets%2F85ae64edf528ce6e981889f3f3c285d9
	tmp/cache/assets/D6B/8E0/sprockets%2F90c51950f6b3f72463aaf0b9ddcf50d5
	tmp/cache/assets/D6D/8E0/sprockets%2Ffb27a22b12645e46be65f0f53aaed788
	tmp/cache/assets/D6E/B90/sprockets%2F4fd4b313ac6816b91f407c1d8d68e1fc
	tmp/cache/assets/D6F/C10/sprockets%2F1ac5d3c3afa4e7f055918c831ec845f4
	tmp/cache/assets/D71/A80/sprockets%2F1fbb21d7dbcff3e3449660783aca3795
	tmp/cache/assets/D73/B10/sprockets%2F7526727edad26862a5c47ac4d2d19cfd
	tmp/cache/assets/D74/6E0/sprockets%2F48ed3d8e7d8090be0c62066ec02e6de7
	tmp/cache/assets/D7F/530/sprockets%2F4c5a18ff7b4e0cdb995d9765f12a87f1
	tmp/cache/assets/D90/920/sprockets%2F6231b455d47f45ef0aa21ed7fb09acc2
	tmp/cache/assets/D92/6F0/sprockets%2F1ad5b85ba7fbc84003baa6d4464ef265
	tmp/cache/assets/D94/7A0/sprockets%2F4a0d1f555b98a4efb17e5204f50a9acc
	tmp/cache/assets/D97/E90/sprockets%2Fd9468c7dc1ffd0e0ba244440e9e306ca
	tmp/cache/assets/DB5/BF0/sprockets%2Fdb422eeed57e166a0a2a3d004f0edc62
	tmp/cache/assets/DBB/600/sprockets%2F3d61e25ab0cd27baa6ccf9524233add7
	tmp/cache/assets/DC1/CA0/sprockets%2Fdf91eacf4353a83be0c11b3c1674b8eb
	tmp/cache/assets/DC7/5C0/sprockets%2F9303052deb9c75aa0ab0d8bbd8fb8b69
	tmp/cache/assets/DCA/5C0/sprockets%2Fc1b354e8d2e42f3bca475be1ba7df658
	tmp/cache/assets/DCD/650/sprockets%2Fa4bc40d9b95aef6f12672d3e6b19ccc5
	tmp/cache/assets/DD1/740/sprockets%2Fe2e8f7f4c2e46b20bbaa95d67e83c41e
	tmp/cache/assets/DD2/800/sprockets%2F44cccf18cfe10481afea3463c5bd998e
	tmp/cache/assets/DD6/1F0/sprockets%2F3cbec518a87afb765fea7805c15c97ad
	tmp/cache/assets/DD7/950/sprockets%2F3665aa30fefe8e40fe1f86cc5f90de35
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DF1/710/sprockets%2F0f8aa08bcb16235a9f63bb55b7cdaad8
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E05/680/sprockets%2F6eba99bfcd7b46aadc349d5d4844bc26
	tmp/cache/assets/E0B/A20/sprockets%2F0dcccf3cf5085ef5fb5e5a857889dad0