Initial commit
adding git ignore
merge
merged the merger
Merge branch 'django' of github.com:dthjones/heatswap into django