tify
Merge branch 'master' of https://github.com/tonegolf71/hackmanc

* 'master' of https://github.com/tonegolf71/hackmanc:
  removed vagrant
Added in team view
Merge branch 'master' of https://github.com/tonegolf71/hackmanc

* 'master' of https://github.com/tonegolf71/hackmanc:
  team listigs
  work on access control and creating users:

Conflicts:
	application/views/hacks/hack_listing.php