Added in Laravel Framework
Changed permissions
Merge pull request #1 from McMaster-SEClub/master

Testing Github Functionality
Base layout down, nobranding for seclub
added in css
admin section started
admin section started
Logging off for today, finished login route
added in views and admin users controller
adding in admin interface
fixed admin section. complete new template. Almost functional
removed file
Added in tutorial in the admin section
Fixed the hieght of 3 wells on main page
Added in sql
Merge remote-tracking branch 'upstream/master'

Attempting to merge in new framework
Merge branch 'newFramework'

Conflicts:
	application/controllers/admin.php
	application/controllers/main.php
	application/models/newsmodel.php
	application/views/admin/admin_view.php
	application/views/admin/formFail.php
	application/views/admin/newpost_view.php
	application/views/footer.php
	application/views/home.php
	application/views/news.php
pushing newFramework to master
Merge pull request #9 from matart/master

L4 - Bootstrap