schedule pic
Calendar
Commit
ADding files
removing generated files
Merge branch 'master' of https://github.com/jsextonSIT/GlenRockRepo

Conflicts:
	GlenRockAppV1/gen/com/actionbarsherlock/R.java
Added news article
Implementing Calendar

Changed what we're using to do it, added search and filler text. Needs
on click actions and database stuff.
Merge branch 'master' of https://github.com/jsextonSIT/GlenRockRepo into suketus_test_branch

# By ichugwindex (4) and others
# Via ichugwindex (1) and vjurczenia (1)
* 'master' of https://github.com/jsextonSIT/GlenRockRepo:
  Implementing Calendar
  Added news article
  removing generated files
  ADding files
  Commit
  Calendar
  schedule pic