added dayabase.yml to gitignore
[1546] - Media page
db model part1 created
Merge branch 'master' of github.com:maskrz/ZPI

Conflicts:
	.gitignore
	app/models/user.rb
	app/models/user_analysis.rb
	app/views/static_pages/media.html.erb
	config/routes.rb
	db/migrate/20131016075618_create_messages.rb
	db/migrate/20131016075714_create_user_analyses.rb