Delete or Flag buttons - merge
Merge branch 'master' of https://github.com/hasadna/open-shot

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #100 from tbrisker/master

question validation
Merge branch 'master' of https://github.com/ozomer/ok-qa
Acquisition matters! added a 'post question' button on homepage
Issue #101 - page for flagged-only posts
Merge branch 'master' of https://github.com/hasadna/open-shot

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Making the user's locality immutable, fixing #77
Fix README to create directory 'oshot'
Merge branch 'master' of https://github.com/hasadna/open-shot

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Issue #106 - not pretty, default choice should be the current city.
Remove asterisk from new question form

Since this is the only field in the form, there is no need to indicate that it
is mandatory.
beutification
Merge pull request #102 from amirnissim/master

Acquisition matters! added a 'post question' button on homepage
Merge pull request #104 from danielhers/master

Fix README to create directory 'oshot'
moved city choice
Merge branch 'master' of https://github.com/hasadna/open-shot

Conflicts:
	qa/views.py
added forms.py of oshot
merged
merging... Arrr...