added haml implementation
fixed conflict in app/index.html
changed index.haml to reflect recent changes made in index.html more recently