webjs changes
webjs changes
Merge branch 'master' of https://github.com/tiagoalmeida/bitstarter
Merge branch 'master' of https://github.com/tiagoalmeida/bitstarter

Conflicts:
	index.html
Wireframed index