Add static page controller and about_us page
Resolved merge conflict _header.html.erb
Merge branch 'master' of github.com:makersacademy/student-directory