added test user
devise login setup
gitignore file for Ankoors version
JE gitignorefile
carrierwave - user image
nothing changed
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development

Conflicts:
	.gitignore
	log/development.log
	tmp/pids/server.pid
Add planning/wireframes/landing omnigraffle
remove Planning folder because items inside are to big to upload to github
Remove gem pry-debugger to solve bundle error due to the gem not being compatible with another gem
second carrierwave, images upload on cheerups working
RUN db:seed!! - created seed file
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development
Add validations for User.model and Cheer_up.model
Getting seed data in
update validations to let firstname and lastname only to be validated in the update form
Add bootstrap.min.css
Add basic nav bar
Added remove user image functionality
add function to pull CheerUps and User details along with either model. Add function to vote up and vote down a cheerup