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 branch 'master' of github.com:ambertunnell/worldview
adds styling to form before logging in
Merge branch 'master' of github.com:ambertunnell/worldview