Gemfile.lock add
Gemfile.lock modified
Merge branch 'master' of heroku.com:krewetka

Conflicts:
	Gemfile.lock
updates
updates
updates
update and layout
deleting images
Delete temp files from repo
refactoring - out-of-convention method names
Upgrade to rails 3.2.13
Static pages contents edition is now possible
no id in one record fix
FIXED FUCKED UP CSS