got the date formatted correctly
Merge pull request #13 from tbuchanan/master

css fixes
changes to popups.js
some changes to js file
Merge branch 'master' of https://github.com/mathur7/Project-2

Enabled assets in production and removed precompiled assets from git

Conflicts:
	app/assets/javascripts/popups.js
	app/assets/stylesheets/application.css
	app/views/popups/index.html.erb
fixed merge conflicts