deleted:    db/migrate/20140224092324_add_attachment_avatar_to_users.rb
	modified:   db/migrate/20140226110340_add_avatar_to_users.rb
	modified:   db/schema.rb
Merge branch 'master' of https://github.com/rorymunro/musculation

Conflicts:
	db/schema.rb

	deleted:    app/views/exercices/biceps.html.erb
	deleted:    app/views/exercices/triceps.html.erb
	modified:   db/migrate/20140228105831_add_fent_a_pied_and_squat_un_haltere_and_hip_poussee_and_sauter_sur_une_boite_and_mollets_elevation_and_souleve_jambes_raides_and_snatch_souleve_to_customs.rb
	renamed:    db/migrate/20140226110340_add_avatar_to_users.rb -> db/migrate/20140302122004_add_avatar_to_users.rb
	modified:   db/schema.rb
	new file:   db:create
	new file:   db:migrate
	deleted:    public/system/users/avatars/000/000/103/medium/chickens.jpg
	deleted:    public/system/users/avatars/000/000/103/original/chickens.jpg
	deleted:    public/system/users/avatars/000/000/103/thumb/chickens.jpg