idk, probz just gonna overwrite it anyways
Merge branch 'davidbranch' of https://github.com/lewisren/FuelEd into davidbranch

Conflicts:
	app/models/appointment.rb