dev-work first one
phpstorm
Mod index.html
Update index.html
Update index.html
Update index.html
index.html
index.html
Update index.html
L!fe...
L!fe
delete
delete dev-work
Merge branch 'dev-work'

Conflicts:
	apps/wna.today/framework/views/index.html
	apps/wna.today/public/css/grid.css
	apps/wna.today/public/css/normalize.css
	apps/wna.today/public/css/style.css
	apps/wna.today/public/images/decorative.png
	apps/wna.today/public/images/dribbble.png
	apps/wna.today/public/images/footprints.png
	apps/wna.today/public/images/logo.png
	apps/wna.today/public/images/sunglasses.png
	apps/wna.today/public/images/twitter.png
	apps/wna.today/public/js/jquery.easing.1.3.js
	apps/wna.today/public/js/jquery.stellar.min.js
	apps/wna.today/public/js/waypoints.min.js
gitignore added
added config
deletewq config
dell gitignore
Merge branch 'dev-home'
add excluded