Resolved merge conflicts
Random
Transponded Feng's HTML-CSS into EJS
Google Maps init script
server.js cleanup
Added Twitter search form route
Displaying Twitter Results