:neckbeard: Added .gitattributes
Caylas module additions
Merge remote-tracking branch 'upstream/master'
Cayla's Icons Added

Added in icons for the module pieces
Cayla's Changes

Changed icons for modules. removed some other icons. Added in wolber's
changes to sitebase and media.
Cayla

Merging with Jordan's files
Cayla

Changed modules.html to have the new icons
Merge branch 'master' of https://github.com/cshaver88/appinventororg
into cshaver88-master

Conflicts:
	assets/js/coursesystem.js
ya
Milestone commit, lol bad commit message