Header, Nav Bar,implemented CSS
deleted application erb
Added line to application.html.haml
Updated application files
fixed merge conflict
updated program select on form