fixed wierd merge, made functional project page