D  CNAME
D  assets/bootstrap/css/bootstrap-responsive.css
D  assets/bootstrap/css/bootstrap-responsive.min.css
D  assets/bootstrap/css/bootstrap.css
D  assets/bootstrap/css/bootstrap.min.css
D  assets/bootstrap/img/glyphicons-halflings-white.png
D  assets/bootstrap/img/glyphicons-halflings.png
D  assets/bootstrap/js/bootstrap.js
D  assets/bootstrap/js/bootstrap.min.js
D  assets/css/darkstrap.css
D  assets/css/pygments.css
D  assets/css/style.css
D  assets/images/aftership_logo.png
D  assets/images/bgs/body.png
D  assets/images/shopaltyic_docs_logo.png
D  assets/images/shopalytic_logo-200x55.png
D  assets/js/jquery.min.js
D  clients/javascript.html
D  events.html
D  how_it_works.html
D  index.html
D  methods.html
Merge branch 'gh-pages' of github.com:Shopalytic/docs into gh-pages

Conflicts:
	clients/javascript.html
	events.html
	how_it_works.html
	index.html
	methods.html