Merge branch 'master' of https://github.com/ryanx30/PHP-Bootstrap

Conflicts:
.htaccess
Changed file types to .rlk