Git broke.. Sorry.

Application.cpp went retard on mergeconflicted push.. This is an attempt
to fix that.