Changed template.php stuff to be in welcome/index instead
Merge branch 'master' of https://github.com/havok2905/Soltaar
Merge branch 'master' of https://github.com/havok2905/Soltaar
Merge branch 'master' of https://github.com/havok2905/Soltaar
Ajaxing in matches, not working yet
Merge branch 'master' of https://github.com/havok2905/Soltaar