test2
Merge branch 'gh-pages' of https://github.com/projectBS/bsShortURL into gh-pages

Conflicts:
	django/ligoapp/views.py
test2