ror-project model for tables
Merge branch 'master' of https://github.com/mdk199/rorproject

Conflicts:
	Gemfile
	app/models/question.rb
	tmp/cache/assets/C36/7D0/sprockets%2F78a35ac73a268573a5c6128899958802
	tmp/cache/assets/C84/C10/sprockets%2F4922aff230b297d57c918783cb225660
	tmp/cache/assets/CAD/410/sprockets%2Fc2248fad61381dd323235d649c77b273
	tmp/cache/assets/CCD/9C0/sprockets%2Fbbbc469967369c664520f19f48f789a2
	tmp/cache/assets/CE0/A10/sprockets%2Fa5d3ca1ef19ba82a77893423691d6514
	tmp/cache/assets/CE0/CC0/sprockets%2F2b38c3fb549036de5c4666637a0c80c6
	tmp/cache/assets/CE2/830/sprockets%2F6cb795424a80916428aa8c0efe109f62
	tmp/cache/assets/CEE/110/sprockets%2F9b76d70a4871f0a4668bb57768a6e7b1
	tmp/cache/assets/CFE/C90/sprockets%2F6e667cab177126321bdd2f0cd1414d36
	tmp/cache/assets/D18/640/sprockets%2Fc3d8ee2c04f791aea041587457745ef5
	tmp/cache/assets/D18/DD0/sprockets%2Fd85268d32cd27a3b8c30f19df86d8361
	tmp/cache/assets/D1C/CF0/sprockets%2F59d9291f5b448fe62cc552fb470c0c77
	tmp/cache/assets/D1D/5F0/sprockets%2F89a8049a0ddef938d67c4af9234f1352
	tmp/cache/assets/D1E/CC0/sprockets%2Fc5cb3c00b25f21ab4e3dc485a1245072
	tmp/cache/assets/D21/D70/sprockets%2F9593ab32c81d58d1a79f7456db9b06f7
	tmp/cache/assets/D31/D80/sprockets%2F18a1295906eebba880cf31e814d132ab
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D39/2B0/sprockets%2Fa45bb371de739f2b9239451d484aa3ac
	tmp/cache/assets/D42/450/sprockets%2F8bad5a3a3a02b8a733f15f97855c7b96
	tmp/cache/assets/D47/CC0/sprockets%2Fc828fec22c4bf8969f38ee10b210b774
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D4F/B00/sprockets%2Ffe2523ff1f48959bd90de26ba075c965
	tmp/cache/assets/D50/E50/sprockets%2F45b26945219ed398c4902bcf955cefce
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D69/410/sprockets%2F1f77a588d4d03bc0214ccdbff08d2881
	tmp/cache/assets/D69/EC0/sprockets%2Fa11b51e8b894aa44dc983eb1b541db96
	tmp/cache/assets/D6B/E60/sprockets%2Fdf9e4edbb70cc121595a814be0b86580
	tmp/cache/assets/D73/F90/sprockets%2F614b6e9b1ad168982fed29c0dbd3465c
	tmp/cache/assets/D98/C90/sprockets%2Ff34935b3d1ccd1be64e7a6b75941b4ba
	tmp/cache/assets/D9D/A00/sprockets%2F40e98cda368c2c8f2fe5ec074036c0eb
	tmp/cache/assets/DA4/300/sprockets%2Fbb2cc92f946585adc5cbbe3528742e3f
	tmp/cache/assets/DA6/330/sprockets%2Fc1499766b3a2264caf090bf73e7ecffd
	tmp/cache/assets/DC5/6D0/sprockets%2Fbf7aed04b0f52e1b180c4abc876ad669
	tmp/cache/assets/DC5/C10/sprockets%2F62c7371f122e0e1f2db4d8bfd8aa82fb
	tmp/cache/assets/DC8/1A0/sprockets%2Fd51cac3ca5b776939aebed9a93a001f5
	tmp/cache/assets/DCC/630/sprockets%2F4cefcf1c16b48eb1b6b287ad438f5f31
	tmp/cache/assets/DDA/610/sprockets%2Ffc338f1861470ebe2f6e4cc09d7db7ff
	tmp/cache/assets/DFF/4A0/sprockets%2F6f31fd2f472adddc414fc7184ec3ed6d
	tmp/cache/assets/E02/C50/sprockets%2F5fd05b274746dc9b5c07ffcd55dcac8a
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E0B/050/sprockets%2Fbcdd6120e6b66ee2fefdcb994b16859e
	tmp/cache/assets/E3B/080/sprockets%2F09e2a090befacdae0db10cafb1893a0a
ror-project model with associations