remove facebook like from all pages
change current password layout and remove facebook login from all pages
Revert "change current password layout and remove facebook login from all pages"

This reverts commit d64cbde5d9689af65a3b539407b5fea96d300d49.
Revert "Revert "change current password layout and remove facebook login from all pages""

This reverts commit e25bcb20e7008c383ecd8a5595793dffaa74babc.
Revert "remove facebook like from all pages"

This reverts commit 9ba68f29fba438f2c3dfd980e7b8c70977090ad8.
Revert "change current password layout and remove facebook login from all pages"

This reverts commit d64cbde5d9689af65a3b539407b5fea96d300d49.
add profile images to gitignore
Merge remote-tracking branch 'upstream/master'
remove facebook like links on all pages
change contact and edit page layout
Merge pull request #36 from pedrogrande/master

Edit Poem button fix on home page
Merge pull request #37 from JurgensSmit/master

Layout changed and gitignore edited.
Added FriendlyId (slugs) to User
Merge remote-tracking branch 'upstream/master'

Added FriendlyId to Users