photo like button text tweak
resolves merge conflict
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
Merge pull request #46 from ambertunnell/ben_3

Ben 3
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview into ben_3
Merge pull request #47 from ambertunnell/ben_3

Updates todo.md
adds styling to form before logging in
Merge branch 'master' of github.com:ambertunnell/worldview
adds validation line above form when not logged in
Merge branch 'master' of github.com:ambertunnell/worldview into ben_3
Specifies social media icon image sizes for optimization