Merge branch 'Zane' of https://github.com/adminion/adminion
Merge branch 'Zane' of https://github.com/adminion/adminion
removed
started redoing- deal and buy phase functional.
Merge branch 'master' of https://github.com/adminion/adminion

Conflicts:
	index.js