<<<<<<< HEAD solar_update

======= solar_new

dedbf7b89ed7db1072cd8b7ce0314c6b28c4a797

Name		Name	Last commit message	Last commit date
Latest commit History 11 Commits
mysite		mysite
newapp		newapp
README.md		README.md
db.sqlite3		db.sqlite3
manage.py		manage.py
myfig.png		myfig.png
mysite.tar.gz		mysite.tar.gz