init
add tweet button
fix: tweet
first commit
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/public/index.jade
Merge remote-tracking branch 'remotes/upstream/master'
add: loading icon
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/public/index.jade
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	Gruntfile.js
	src/public/js/main.ts
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/public/index.jade
fix: script load timing
Merge branch 'master' of github.com:progre/template-html
add: ng-animate
fix: config definition
fix: config definition
Merge branch 'master' into html

Conflicts:
	Gruntfile.js
Merge branch 'html' into static-angularjs

Conflicts:
	Gruntfile.js
fix: definition
fix: sourcemap path