changed timer to show on page load
Copy change
Merge branch 'master' into greg

* master:
  Copy change
  fixed login, sign up is still buggy
  Positioning and changing button colors.
  fixed navbar issue, getting user reg finished
  Repositioning.
  working on sign up process.
  Reformatted and positioned.

Conflicts:
	app/views/bottle.blade.php
	app/views/breast.blade.php
Merge pull request #61 from hipsterwannabe/greg

Greg