Commit refactored project.
Merge branch 'master' of github.com:dshum/flute

Conflicts:
	public/index.php