Conf file for heroku again.

Signed-off-by: john-trembath <fudgebucket27@gmail.com>
Merge branch 'master' of heroku.com:blooming-fjord-3049

Conflicts:
	conf/evolutions/default/1.sql

Signed-off-by: john-trembath <fudgebucket27@gmail.com>
DB generation

Signed-off-by: john-trembath <fudgebucket27@gmail.com>
DB generation
db

Signed-off-by: john-trembath <fudgebucket27@gmail.com>
trying sql again.

Signed-off-by: john-trembath <fudgebucket27@gmail.com>
Merge branch 'master' of https://github.com/john-trembath/scheduler-heroku

Conflicts:
	app/controllers/Appointments.java
	app/models/Appointment.java
	app/views/administrator.scala.html
	app/views/booking.scala.html
	conf/evolutions/default/1.sql

Signed-off-by: John Trembath <fudgebucket27@gmail.com>
Conf file

Signed-off-by: John Trembath <fudgebucket27@gmail.com>
Signed-off-by: John Trembath <fudgebucket27@gmail.com>
Merge branch 'master' of heroku.com:blooming-fjord-3049

Conflicts:
	conf/evolutions/default/1.sql

Signed-off-by: John Trembath <fudgebucket27@gmail.com>
db
Getting stuff done.

Signed-off-by: John Trembath <fudgebucket27@gmail.com>