changes
Merge branch 'master' of github.com:rishabh-tripathi/voucherdonor

Conflicts:
	config/routes.rb
	log/development.log
	tmp/cache/assets/BC0/A10/sprockets%2F22668f93153a6c2017038a0517897156
	tmp/cache/assets/C53/CB0/sprockets%2F45664bcd2865096e984506130a1dc438
	tmp/cache/assets/CB9/EF0/sprockets%2Fad5b69b5d77a175489c2735149d96a00
	tmp/cache/assets/CD7/6F0/sprockets%2Fbd3936370d0f952ada5774e2230046ed
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/CE2/7F0/sprockets%2Fd530f2013563f61add16455f9e94ae59
	tmp/cache/assets/CE3/E40/sprockets%2Ff1cb925477f2ce19b93be60711e42691
	tmp/cache/assets/CE7/CA0/sprockets%2F9a038be696cbcf0834d1639950b1946b
	tmp/cache/assets/CE8/CF0/sprockets%2Fa27e4a37992e4564b0d7955720dbc56e
	tmp/cache/assets/CF2/010/sprockets%2F7be9086c960bb4384c9d23a52e489f29
	tmp/cache/assets/D03/B40/sprockets%2Ff391b64235b7ad17b81ab7754710ea1d
	tmp/cache/assets/D06/B40/sprockets%2F25fca4643219052b0d5c66cf2c71f72f
	tmp/cache/assets/D10/F70/sprockets%2F8a801c4582f4a0da8dd8b15ef3219918
	tmp/cache/assets/D13/FE0/sprockets%2Fc7c13f930627eca0c51784d28da773e7
	tmp/cache/assets/D21/D90/sprockets%2F5d5fc94741487e26dc6da77d28720ae8
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D62/1B0/sprockets%2F2275b59a74e23828b6f6dbaaadb140f0
	tmp/cache/assets/D6B/420/sprockets%2Fa6695cce14afa00ef458070bb2778c9a
	tmp/cache/assets/D73/9B0/sprockets%2Ff6eeb33602682bd6ff6d1f177f6b142d
	tmp/cache/assets/D95/BC0/sprockets%2F4ea33e825e6e38bd22dccab488a0255b
	tmp/cache/assets/DA7/530/sprockets%2Fe36b8fcf5914a3a6bf058abfe7367b19
	tmp/cache/assets/DB7/6C0/sprockets%2F386e9196dd0f9efdce6f92ce93a6d107
	tmp/cache/assets/DC9/3A0/sprockets%2F0ceedad8bc945c2029529eb4fbf0931b
	tmp/cache/assets/DCA/D00/sprockets%2Ff324a14742ede1fd794a4286bcfd0bde
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DDE/D30/sprockets%2Fbfe629e44bcdac68d5e18d8f219e9a44
	tmp/cache/assets/DE4/0C0/sprockets%2F6b6e86e81f5e8f80bb2b3d1e8f7ed7f3
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E19/2A0/sprockets%2F10fcfbe6ebae11a40c8eac41939a1b9a
	tmp/cache/assets/E3C/E70/sprockets%2Fef7c8ce46dfc9e9087ce84dbdfdd0011
	tmp/pids/server.pid