new file:   public/css/acmicon.css
	new file:   public/font/acmicon.eot
	new file:   public/font/acmicon.svg
	new file:   public/font/acmicon.ttf
	new file:   public/font/acmicon.woff
	modified:   app/macros.php
	modified:   app/models/TutorialTopic.php
	modified:   app/views/admin/dashboard.blade.php
	modified:   app/views/forum/index.blade.php
	modified:   app/views/lanparty/roster/index.blade.php
	modified:   app/views/lanparty/signup.blade.php
	modified:   app/views/pages/about.blade.php
	modified:   app/views/partials/navbar.blade.php
	modified:   app/views/sig/create.blade.php
	modified:   app/views/sig/index.blade.php
	modified:   app/views/sig/sig.blade.php
	modified:   app/views/tutorial/create-tut.blade.php
	modified:   app/views/tutorial/edit-tut.blade.php
	modified:   app/views/tutorial/tut-index.blade.php
	modified:   app/views/tutorial/tut-topic.blade.php
	modified:   app/views/tutorial/view-tut.blade.php
	modified:   public/css/acmicon.css
	modified:   public/css/styles.css
	modified:   public/font/acmicon.eot
	modified:   public/font/acmicon.svg
	modified:   public/font/acmicon.ttf
	modified:   public/font/acmicon.woff
Merge branch 'master' of https://github.com/bhoeting/mason-acm-website
	modified:   app/config/database.php
	modified:   app/macros.php
	modified:   app/views/admin/dashboard.blade.php
	modified:   app/views/forum/index.blade.php
	modified:   app/views/pages/about.blade.php
	modified:   app/views/partials/navbar.blade.php
	modified:   app/views/profile/edit.blade.php
	modified:   app/views/sig/index.blade.php
	modified:   app/views/sig/sig.blade.php
	modified:   app/views/tutorial/tut-index.blade.php
	modified:   app/views/tutorial/tut-topic.blade.php
	modified:   public/css/acmicon.css
	modified:   public/css/styles.css
	modified:   public/font/acmicon.eot
	modified:   public/font/acmicon.svg
	modified:   public/font/acmicon.ttf
	modified:   public/font/acmicon.woff
	0
	_ide_helper.php
	app/storage/sessions/
	app/views/layouts/masterWithTitleAndIcon.blade.php
	vendor/
	new file:   0
	new file:   _ide_helper.php
	new file:   app/storage/sessions/de36b3ac167d2221911a7ce7d92adc8c6fbaf1b2
	new file:   app/views/layouts/masterWithTitleAndIcon.blade.php