deleted tmp file
Merge branch 'development' of github.com:sweetlevy/Project_2_Grumpy_Cat into development

Conflicts:
	tmp/cache/assets/development/sass/03ab449c08b8bfec39d7036a59d008b223ccd692/welcome.css.scssc
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1a612134787eecca2235c3f0abcde8b7
	tmp/cache/assets/development/sprockets/2211190fb757d05874e2b25fc37a31ad
	tmp/cache/assets/development/sprockets/25be0cf14bf3ef22d271a080ccb41620
	tmp/cache/assets/development/sprockets/2f2229c70dcf195564d4d0fd6a12ac1a
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/3233432f81669b9bd10ef726c526d348
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/363c363c8eae1151a28d62f4be117195
	tmp/cache/assets/development/sprockets/4e9c1e06a48ae8c6eacb0380ad9b2e08
	tmp/cache/assets/development/sprockets/503635dfced750a8078cc0d9d80ae767
	tmp/cache/assets/development/sprockets/6d436974b3a34a062caadcb7df254606
	tmp/cache/assets/development/sprockets/7c302fc39dfbab029fe4e755f3166c02
	tmp/cache/assets/development/sprockets/93708cb34051f3000884905e8669d74a
	tmp/cache/assets/development/sprockets/a88c6da82038c51eb6cce21bd3286331
	tmp/cache/assets/development/sprockets/bd71546009ab5e606b3f27b4c6a79856
	tmp/cache/assets/development/sprockets/bdc02cc89fd835247d1ad847624e3e94
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/ffd7643b7c429e23bdb2281097a5e096
Merge branch 'development' of github.com:sweetlevy/Project_2_Grumpy_Cat into development
Merge branch 'development' of github.com:sweetlevy/Project_2_Grumpy_Cat into development
new seed file to include board_id and category_id
added gitignore