Changed configuration to green
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Repaired configuration green
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Edited configuration speed.
updated configuration to yellow printer
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Configuration temperature
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Configuration.h
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Configuration.h
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1