Updated front page
Resolved conflicts