dicked around
Merge branch 'master' of https://github.com/callmemc/altbreaks
et

Conflicts:
	db/seeds.rb
hi
fuck
Added AdminPermission