Added Membership model and associations with other models. also created views and controller for meberships
Added Membership model and associations with other models. also created views and controller for meberships
added images
messages
sorted out some bullshit
adding
Merge branch 'master' of https://github.com/willpiers/flashcardapp

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
too much to say. lots of styles
whaaat?
message
updates sizeable pngs
merging all updates files