adding two more weeks to the countdown
Merge branch 'master' of https://github.com/joshuamoore/prelaunchr

Conflicts:
	app/views/users/new.html.erb