made css changes
merge fix
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development
Merge branch 'merging_css_files' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into merging_css_files
rspec testing of board,sticky,user models and sticky,user features.  commented out the welcome_controller_spec file because it isn't currently being used.
Merge branch 'development' of github.com:sweetlevy/Project_2_Grumpy_Cat into development
category is adding to database
done
 starting user auth
new
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development
adding user auth
add user auth
updated the css of the app
updated css/javascript
changed board content
add jquery ui gem
added gems
fixed add board link
fixed sticky/category links on board pages