init new version
oups
Merge branch 'master' of github.com:maiis/maiis.me

Conflicts:
	.editorconfig
	.gitignore
	.jshintrc
	Gruntfile.js
	app/.htaccess
	app/404.html
	app/index.html
	app/scripts/main.js
	app/styles/main.scss
	bower.json
	package.json
	test/index.html
	test/spec/test.js
delete all