(cleanup) remove unnecessary edscrips file
(cleanup) remove unnecessary edscrips file
(cleanup) removed logic from controllers and built a factory for the rooms, also added a timer to the room
Merge branch 'cleanup/editor' of https://github.com/Morgantheplant/code-duel into cleanup/editor
(cleanup) fixed typo in reset
(cleanup) remove unnecessary edscrips file
(cleanup) removed logic from controllers and built a factory for the rooms, also added a timer to the room
(cleanup) fixed typo in reset
(cleanup) fixed merge conflict in index.html
(cleanup) remove unnecessary edscrips file
(cleanup) removed logic from controllers and built a factory for the rooms, also added a timer to the room
(cleanup) fixed typo in reset
(cleanup) removed logic from controllers and built a factory for the rooms, also added a timer to the room
(cleanup) fix merge conflicts in roomService and roomView
(cleanup) remove duplicate buttons from merge conflict
Merge pull request #29 from Morgantheplant/cleanup/editor

(cleanup) removed logic from room controller and built a factory, also added a timer (click it to run for now)
Pushing up for @radicalsauce to work on
Fixes rooms to accept only two members.
Add sockets functionality to front-end.
(refactor) Integrate socket functionality with Angular front-end.