[fix] added compiled files to gitignore
[fix] revert changes
Merge branch 'master' of https://github.com/mahsu/HTHS-Secret-Santa
[fix] added phpmyadmin
[fix] minor quovolver setup changes
Merge branch 'master' into develop

Conflicts:
	application/config/email.template.php
[new] began revamping of admin panel
[fix] updated bootstrap to 3.2
[fix] updated fontawesome to 4.2