redo
Cleaning things up
Merge branch 'master' of github.com:elmasrya/MyGitHub

Conflicts:
	Readme.md
	app/index.html
	app/scripts/main.js
	app/styles/main.scss
	bower.json
	gulpfile.js
	test/bower.json