Merge pull request #4 from mayank2707/rails4

Changes for index page
finished contact form and magnific popup

hid delete/make profile image on lightbox
Merge branch 'rails4' of https://github.com/pwz2k/date into rails4

Conflicts:
	Gemfile
	app/views/users/index.html.slim
gem and index.html.slim
small changes
stuff
Merge branch 'rails4' of https://github.com/mayank2707/date into mayank2707-rails4

Conflicts:
	Gemfile
	app/views/users/index.html.slim
stuff
working on newsletter
integrated conversation index page
kok
k
my changes
still
ok
bug fixes