add init basic bootstrap layout
fix layout indentation
Merge pull request #5 from joekteo/add-bootstrap

add initial basic bootstrap layout
Refactoring on router and controllers.
Merge pull request #6 from paulld/remove-hashtag

Refactoring on router and controllers.
add ng-href and fixed routing
Merge branch 'add-links' of https://github.com/joekteo/prediktapp into joekteo-add-links

Conflicts:
	app/assets/javascripts/angular-application.js
	app/assets/javascripts/angular/angular-config.coffee
	app/assets/javascripts/angular/controllers/index_controller.coffee
	public/templates/other.html
	public/templates/welcome.html
Merge branch 'joekteo-add-links'

Resolve conflicts