initial commit
first pull
added peng's App Id
working
something
updated html
Merge branch 'development'
shrinking buttons
modified z-index
Merge branch 'master' of https://github.com/jackyujieyang/SwarthmoreConnection into peng
fixed small problem
html
responsive nav_bar
Merge branch 'jack' into development
Added editplan as well as 'create plan for this location'
sdf
Merge branch 'orhan' into development
Merge branch 'development'

Conflicts:
	public/index.html
version 0.7
merged from master. up to date