first commit
first commit
first commit
first commit
testing implementation
Merge branch 'master' of https://github.com/svolpe43/training

Conflicts:
	app/controllers/ContentController.php
	app/controllers/TestController.php
	app/controllers/UserController.php
	app/database/migrations/2014_10_13_010350_db.php
	app/filters.php
	app/models/Attempt.php
	app/models/Module.php
	app/routes.php
	app/views/dashboard/addquestionfieldset.blade.php
	app/views/dashboard/classPicker.blade.php
	app/views/dashboard/editMod.blade.php
	app/views/dashboard/editUser.blade.php
	app/views/dashboard/editquestionfieldset.blade.php
	app/views/dashboard/module.blade.php
	app/views/dashboard/reporting.blade.php
	app/views/dashboard/userPicker.blade.php
	app/views/dashboard/userfieldset.blade.php
	app/views/dashboard/users.blade.php
	app/views/forms/login.blade.php
	app/views/home.blade.php
	app/views/master.blade.php
	app/views/testing/modules.blade.php
	app/views/testing/question.blade.php
	app/views/testing/start.blade.php
	app/views/testing/video.blade.php
	public/css/styles.css
	public/js/site.js
	vendor/laravel/framework/src/Illuminate/Auth/Guard.php
Merged to master
deleted bs files