account handling adjustments
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:mromrell/address-book
Merge branch 'addQuestions'
account handling adjustments
Added more to the addQuestions skeleton, It's more dynamic and values are mostly submitable to the server
Merge branch 'addQuestions'

Conflicts:
	public/js/controllers.js
Made minor visual changes
Merge branch 'showProposals'
Made minor viusal changes
Got the proposal object to be pulled in from the server
Merge branch 'master' into addQuestions
Merge branch 'addQuestions'
added ability to dynamically add options to questions in the Add Proposal section
update: this version intermitantly submits a proposal when clicking 'add a question'
merging with Skylars master
Merge branch 'master' into addQuestions