Merge pull request #1 from StyleASD/Create_Layout

First push
Added computer names.
Revert "First push"
Merge pull request #2 from StyleASD/revert-1-Create_Layout

Revert "First push"
Created users table migration
Merge branch 'Create_Layout' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/database/migrations/2014_11_18_095344_create_users_table.php
	app/views/master.blade.php
Merge branch 'master' of https://github.com/StyleASD/team_citadel into Create_Layout

Conflicts:
	bootstrap/start.php