resolve conflict
Merge branch 'master' of https://github.com/Reiko-JS/JavaScript-UI-and-DOM-2014-Teamwork
Merge branch 'master' of https://github.com/Reiko-JS/JavaScript-UI-and-DOM-2014-Teamwork
styles update