Added "save in progress" feature
Merge branch 'master' of https://github.com/djorda9/Simulated-Conversations

Conflicts:
	vagrant/simcon/views.py

Signed-off-by: nmyers322 <nmyers322@gmail.com>