from laptop
add dist bower components
new button title
new image url
 new url
 new url
with a
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Gruntfile.js
	app/index.html
	app/styles/main.css
	app/views/butik.html
	app/views/main.html
	bower.json
	dist/index.html
	dist/scripts/af028490.modules.js
	dist/styles/4e7653ab.main.css
	dist/styles/8596adf0.main.css
	dist/styles/bde584cb.main.css
	dist/views/butik.html
	dist/views/main.html
flash is working
flash is working
flash is working