adding testing stuff for slim
adding testing stuff for slim
setting up intial routing
setting up intial routing
phpinfo not working?
adding .htaccess for slim routing
forgot a line in htaccess
LOLWAT
css changes and moving files to classes
configuring upload.php
Merge branch 'master' into composer+travis

Conflicts:
	public_html/.htaccess
	public_html/bucket.html
	public_html/classes/createThumb.php
	public_html/classes/upload.php
	public_html/index.php
	public_html/sample_gallery.html