Initial Upload
Resync
Merge branch 'master' of https://github.com/alyunyang/Phrollic

Conflicts:
	.DS_Store
	admin.php
	base.php
	bootstrap.css
	bootstrap.min.css
	bootswatch.less
	css/bootstrap-responsive.css
	css/bootstrap-responsive.min.css
	css/bootstrap.css
	css/bootstrap.min.css
	css/font-awesome-ie7.css
	css/font-awesome.css
	css/main.css
	default/bootstrap-responsive.min.css
	default/bootstrap.css
	default/bootstrap.min.css
	default/index.html
	default/variables.less
	index.php
	js/bootstrap.min.js
	js/bootswatch.js
	js/bsa.js
	js/jquery.smooth-scroll.min.js
	login.css
	logo.svg
	logout.php
	oldindex.php
	register.php
	searchpeople.php
	searchresult.php
	signin.php
	skyline.jpg
	sql/users.sql
	thumbnail.png
	variables.less