# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# On branch master## Initial commit## Changes to be committed:#   (use "git rm --cached <file>..." to unstage)#	new file:   Templates/base.html	new file:   Templates/books/author_detail.html	new file:   Templates/books/publisher_list.html	new file:   Templates/books/template_1.html	new file:   Templates/current_datetime.html	new file:   Templates/footer.html	new file:   Templates/header.html	new file:   Templates/hours_ahead.html	new file:   Templates/libpeerconnection.log	new file:   Templates/search_form.html	new file:   Templates/search_results.html	new file:   Templates/srb/align_data.html	new file:   Templates/srb/align_filter.html	new file:   Templates/srb/coordinate.html	new file:   Templates/srb/coordinateTable.html	new file:   Templates/srb/filter.html	new file:   Templates/srb/graph.html	new file:   Templates/srb/home.html	new file:   Templates/srb/int_data.html	new file:   Templates/srb/libpeerconnection.log	new file:   Templates/srb/location_list.html	new file:   Templates/srb/read_alignment_detail.html	new file:   Templates/srb/table.html	new file:   Templates/srb/template_1.html## Untracked files:#   (use "git add <file>..." to include in what will be committed)##	To-Do.org#	django-debug-toolbar/#	django-extensions/#	mysite/#	testview.py#	v.csv
Merge branch 'master' of https://github.com/alvinwt/DjangoSRBdB

Merge branch 'master' of https://github.com/alvinwt/DjangoSRBdB