Merge branch 'master' into hzListWorkoutDays
getting started with partials and routing
forgot to add the index.html
Merge branch 'master' into hzListWorkoutDays
made _login into modal for desktops
made _login into modal for desktops
getting the routers and controllers going
test json file
forgot to add a couple files
Merge branch 'master' into hzListWorkoutDays

Conflicts:
	site/app/js/app.js
cal partial
Merge branch 'master' into hzListWorkoutDays

Conflicts:
	site/app/js/controllers.js
misspelling fix
login is always a modal now
Add api url
testing json sending to server
change the variable nane of app to calendar
trying to get the schedular to work as a partial
logging in is tested and works well and gets error messages from the server
added the css folder to the git ignore