Estamos adicionando a função de postar fotos
Função de postar fotos foi inserida
historia.txt: Semana 06/08 - 13/08
Concluimos a função de postar fotos

commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/pavalucas/projeto-SACI
Consertamos o problema do github
Merge branch 'master' of https://github.com/pavalucas/projeto-SACI

Conflicts:
	historia.txt
lixo
Merge branch 'ok'
Merge branch 'master' into ok
Merge branch 'master' of https://github.com/pavalucas/projeto-SACI into menu

Conflicts:
	first_app/app/helpers/groups_helper.rb
	first_app/app/views/groups/show.html.erb
	first_app/app/views/static_pages/home.html.erb